5 ms·
Parent comment is saying that the merge tool is not going to be able to interpret the conflicts in the file without having diff3 configured as the marker format
by 63stack 3y ago
Parent comment is saying that the merge tool is not going to be able to interpret the conflicts in the file without having diff3 configured as the marker format.
- Too 3y agoWrong. git mergetool command passes the 3 versions of the files in whole. No conflict markers.
- kentonv 3y agoFine. But if someone knows to use mergetool, they probably don't have a problem to begin with. My concern is for all of the junior developers out there who are getting conflicts with terrible default conflict marker style and are struggling through it because they didn't know there was a better option. Educating everyone on how to use `git mergetool` would be great but it is hard. Changing the default so that conflict markers is understandable is easy and benefits everyone.