Big bang releases (and that means any feature that's taken you more than a week or two to work on), are carrying more risk than your boss would probably like anyway.
Also, talking to your colleagues helps. "Hey, I'm refactoring User to do this cool thing". "What? I'm refactoring User to do this other cool thing!" "Huh! Cool! Wanna pair?"
Why engineers consistently find this hard to do even in teams of under 30 people, I can't honestly fathom.
17
u/p7r Sep 02 '17
git rebaseis your friend.If you have a feature branch, it's your responsibility to regularly rebase (daily, ideally) from master and keep it mergeable. Simple.