As a long time Sublime Text[1] user, I've been using Sublime Merge[2] since the day it's been launched and it brings me the same speed and minimalism I get with Sublime Text and has evolved quite a lot to be able to do most things I need in a merge tool. Not affiliated with them in any way by the way. [1] https://www.sublimetext.com/ [2] https://www.sublimemerge.com/
a nice feature of sublime merge that i haven't seen in other programs is actually showing you the git commands that will run when you press whatever button
Meld might be useful for comparison, but in my opinion it is inconvenient as a git merge tool. For git merge I need four panels: original file, version A, version B, merged result. Meld has only three panels. Currently I am using KDiff3. It is a little buggy and doesn't have a nice UI but it is the best open source merging tool that I am aware of. It allows choosing lines from original file, from A, B and manual edit…
> original file, version A, version B, merged result Isn't one of version A or B the original file? What am I missing?
IMHO, Meld is the second best open source tool for doing this. On Windows, WinMerge[1] is a better alternative. Too bad is Windows only. For a non-FOSS and cross platform solution I recommend BeyondCompare (U$30.00)[2]. It replicates most of WinMerge UI. [1] https://winmerge.org/ [2] https://scootersoftware.com/
I actually don't understand what people love about BC. The only thing I find it extremely useful for is the occasional files where inline diffs are practically mandatory, like CSVs. Other than that, I generally find it frustrating compared to TortoiseGitMerge, except perhaps for some very specific/unusual scenarios. In particular the line highlighting is annoying - instead of coloring the lines that were added vs. removed differently, it colors lines according to whether they're an "important difference" or "unimportant difference" (?!), which is borderline useless to me. What do people love about it so much?
My .gitconfig for using meld at the git merge tool:
[alias]
mt = mergetool
[merge]
tool = mymeld
conflictstyle = diff3
[mergetool "mymeld"]
# Gives you meld, with three comparison tabs. Assuming you're merging others changes into
# your branch, this shows you:
# - 1st tab: yours|merged result|theirs (do the merge here into the middle pane)
# - 2nd tab: base vs your changes (look at just your changes)
# - 3rd tab: base vs their changes (look at just their changes)
cmd = meld $LOCAL $BASE $REMOTE --output $MERGED --diff $BASE $LOCAL --diff $BASE $REMOTE --auto-merge
Meld might be useful for comparison, but in my opinion it is inconvenient as a git merge tool. For git merge I need four panels: original file, version A, version B, merged result. Meld has only three panels. Currently I am using KDiff3. It is a little buggy and doesn't have a nice UI but it is the best open source merging tool that I am aware of. It allows choosing lines from original file, from A, B and manual edit…
My .gitconfig for using meld at the git merge tool - which gives you that:
[alias]
mt = mergetool
[merge]
tool = mymeld
conflictstyle = diff3
[mergetool "mymeld"]
# Gives you meld, with three comparison tabs. Assuming you're merging others changes into
# your branch, this shows you:
# - 1st tab: yours|merged result|theirs (do the merge here into the middle pane)
# - 2nd tab: base vs your changes (look at just your changes)
# - 3rd tab: base vs their changes (look at just their changes)
cmd = meld $LOCAL $BASE $REMOTE --output $MERGED --diff $BASE $LOCAL --diff $BASE $REMOTE --auto-merge