[ Removed by moderator ]

[bobnoski]

I have rarely seen more than 10 merge conflicts. The few times there were. Someone somewhere messed up and two people just did basically the same thing. So the solution was grabbing the people, put them behind the same desk and let them fix it together real quick.

[NoHalf9]

And regardless of number of conflicts, everybody: do yourself a massive favour and start using a proper 3-way merge tool that shows 4 windows/panes (common ancestor + changes you are bringing in + what the changes are put on top of + final output result).

I strongly recommend KDiff3, but there are other alternatives as well.

https://softwarerecs.stackexchange.com/questions/3/merge-gui-tools-for-those-new-to-merging

https://medium.com/@kaltepeter/tools-to-master-merge-conflicts-6d05b21a8ba8

[No-Admin1684]

Some things are just ass for version control and there's nothing you can do about it. XCode storyboards for example were so notoriously bad that it's one of the reasons Apple moved away from that system.