Arch Linux

hamdav

Member

Registered: 2020-04-17

Posts: 1

What mergetool do you use with git?

I'm looking for some inspiration. What do you guys use to resolve merge conflicts in git?

I've previously been using kdiff3 which is pretty good in terms of functionality but I feel that the layout is not optimal, too much screen space is wasted on menubars.
I also missed my vim keybindings in the cases where you have to manually change the text.
So recently I went back vimdiff but haven't really been finding it satisfactory.

What are you using? Any special configurations/plugins?

xerxes_

Member

Registered: 2018-04-29

Posts: 826

Re: What mergetool do you use with git?

There are multiple tools to compare files: diffutils, meld, diffuse, kdiff3, kompare, vbindiff, xdelta3, diffoscope, also some file managers can compare files (like double commander, just need to setup two shortcuts for cm_CompareContents and cm_CompareDirectories in preferences).

sabroad

Member

Registered: 2015-05-24

Posts: 242

Re: What mergetool do you use with git?

So recently I went back vimdiff but haven't really been finding it satisfactory.

If it's that you don't like the diffs, you can configure a different algorithm in vim:

set diffopt+=algorithm:patience
set diffopt+=indent-heuristic

---

--
saint_abroad