Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Set dummy merge driver merge ours .gitattributes. #751
People don't know that they must set the
The confusion is even greater considering that
I have seen this on two SO questions in which the OP explicitly mentions progit:
and it catches me every time I move machines.
It seems to be a recurring problem and your solution does not seem to address all the cases. In case one branch did not modify the file since the fork, then merging would still overwrite the unchanged file because Git would find a fast-forward instead of a 3 way merge.