On big, fast moving teams, merge conflicts can burn a lot of time
On big, fast moving teams, merge conflicts can burn a lot of time.
5 ways to avoid painful merge conflicts:
1. Reduce team size
2. Clarify code ownership
3. Create small pull requests
4. Split files that conflict frequently
5. Pair program / do frequent code reviews