I'm trying to find a better merge file option and wanted to try out Sublime as of my work is done using it. so I installed Sublimerge and now am stuck. I know I can compare two already open files or compare via the Sidebar but what I want to do is fire it off via the command line so I can kick it off from our source control program like I can with every other merge tool I've seen. Does anyone know the command line format to do this?
N.B. - I've long since given up trying to use sublime to handle merges and instead switched to other tools to handle this. Therefore I've never felt I can accept any answer as I'm not checking them to see if they work in the way I'd want, or indeed whether they work at all.
See "VCS Integration" for details.
As Nickolay already suggested, this is the whole directive you have to put in your
~/.gitconfig
:Taking jnns' answer, but making appropriate changes for windows.
%USERPROFILE%\.gitconfig
:.gitconfig
sublime_text.exe
, NOTsubl
I'm not sure exactly how to do it, but I'm getting closer.
First, you need a handy path to the Sublime binary:
Then, in your git GUI or git command line, configure ~/bin/subl as your merge tool.
I use Source Tree, and I haven't figured exactly how to best use Sublimerge, but I managed to open both versions, merge them, and then I have to do a bit of manual work.
Still not smooth, but better than nothing!