git. Even if I understand the codebase well, I always manage to get my working branch into a merge conflict.
Make sure you’re merging changes from your upstream regularly.
When two people change the same area of code, you get a merge conflict.
So sync often and merge often. Don’t wait until you’re ready to push to merge upstream or you’re gonna have a bad time.
[0]: https://tom.preston-werner.com/2009/05/19/the-git-parable.ht...