Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

Everyone says what Git branch workflow should you use, but honestly, it can be complicated especially for junior developers.

Just commit everything to master and that's all! Sound stupid but worked best for us. I have seen a big software company using this, I learned this from them and never looked back!



We use to do this until someone added a simple bug fix to master and someone added a new feature that wasn't ready to go out yet to master and then master got pulled to update the website and the users were wondering what the hell these new features were that were untested and broken.


Just make sure to rebase every time you start work to avoid merge conflicts, but yes, this is the single most effective git workflow for small and probably larger teams too! I'm in a small team where the lead dev comes from a top SV company and he introduced this workflow and it works great.


Are you being serious or sarcastic?


I'd assume he is serious. It is a lot simpler to avoid merge conflicts that are hard to solve if you always rebase first.


Just a bit curious, how is the code review integrated into this flow?




Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: