> E.g. if you merge two branches with the same patches but in different order, but the file contents are the same at the end, git will need to you to manually address the merges for each patch.
That's not really true - only in the case where the changes are ambiguous.
I've worked on very hairy Git repos and haven't really felt blocked, even when some crazy merge conflicts happened.
That's not really true - only in the case where the changes are ambiguous.
I've worked on very hairy Git repos and haven't really felt blocked, even when some crazy merge conflicts happened.