3 ms·
Even better: Use a visual 3-way mergetool instead of working with the raw text. If that’s too much for you, vscode renders the conflict similar to the raw repr
by Too 3y ago
Even better: Use a visual 3-way mergetool instead of working with the raw text.
If that’s too much for you, vscode renders the conflict similar to the raw representation but with pretty “accept mine” buttons next to it.
- kentonv 3y agoThose merge tools typically take the raw conflict markers as input, and cannot give you as nice of a UI if they are two-way markers instead of 3-way. So you still want to change the default conflict style.
- Too 3y agoTypically you just type “git mergetool” and the tool launches without you having to care about the marker format.
- 63stack 3y agoParent 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.