4 ms·
> the merge conflict resolution UI that lets you go file by file and has a 3-pane split for existing changes, merged file, and incoming changes `git config --g
by pjdkoch 4y ago
> the merge conflict resolution UI that lets you go file by file and has a 3-pane split for existing changes, merged file, and incoming changes
`git config --global merge.conflictStyle diff3`
If you ever wanna go back to the command line, your life will be much easier.