[brunno]

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/

[rubyist5eva]

Sublime Merge is a fanastic tool (I use it) but it's less of a merge tool and more of a git client, which I think is an important distinction.

[forrestthewoods]

Yeah. I would be interested in using Sublime Merge as a Merge tool for projects based in Perforce and Mercurial. But last I checked it wasn't really capable of that.

It should have been called Sublime Git. Alas.

[mackrevinack]

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

[ncann]

Also the ability to create custom menu items (e.g for any context menu) for whatever command you desire. It's a game changer for me that I haven't seen in any other git client.

Also it's lightning fast and relatively bug free compared to the mess that is Sourcetree, which used to be my favorite client but then went utterly downhill.

[btschaegg]

I don't know if it's on par with SM, but Git Fork has a system for custom commands which result in custom context menu entries in most cases.

It uses categories like per-commit or per-branch commands.

[gumby]

Magit does this

[Imagenuity]

Sourcetree also shows the git commands it runs, but not before it runs them.

[csmiller]

i believe the IntelliJ Git tool window does this as well FWIW

[recov]

Same here. So far it's my favorite UX for solving non-trivial merge conflicts.

[ncann]

Same. I don't know why but there's something so intuitive and easy to use and yet so powerful about Sublime Merge's merge tool that it quickly became my favorite after having used a lot of different other tools in the past (TortoiseGit, Meld, etc.)

[LeicaLatte]

I don't understand the comparison. Isn't meld free?

[da39a3ee]

Not sure what you're trying to say. Free vs not free is not the most important axis to consider when evaluating software.