Merging files in Sublime with Sublimerge via command line

Question

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.

Guzzle

Answer 1

 subl -n --wait "<LEFT>" "<RIGHT>" --command "sublimerge_diff_views {\"left_read_only\": true, \"right_read_only\": true}"

See "VCS Integration" for details.

Interradial

Answer 2

As Nickolay already suggested, this is the whole directive you have to put in your ~/.gitconfig:

[merge]
    tool = sublimerge

[mergetool "sublimerge"]
    cmd = subl -n --wait \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\" --command \"sublimerge_diff_views\"
    trustExitCode = false

[diff]
    tool = sublimerge

[difftool "sublimerge"]
    cmd = subl -n --wait \"$REMOTE\" \"$LOCAL\" --command \"sublimerge_diff_views {\\\"left_read_only\\\": true, \\\"right_read_only\\\": true}\"

Freemanfreemartin

Answer 3

Taking jnns' answer, but making appropriate changes for windows.

%USERPROFILE%\.gitconfig:

[merge]
    tool = sublimerge

[mergetool "sublimerge"]
    cmd = sublime_text -n --wait \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\" --command \"sublimerge_diff_views\"
    trustExitCode = false

[diff]
    tool = sublimerge

[difftool "sublimerge"]
    cmd = sublime_text -n --wait \"$REMOTE\" \"$LOCAL\" --command \"sublimerge_diff_views {\\\"left_read_only\\\": true, \\\"right_read_only\\\": true}\"

• note location of .gitconfig
• in windows, the executable is sublime_text.exe, NOT subl
• don't forget to add sublime text executable to the path

Cuspid

Answer 4

I'm not sure exactly how to do it, but I'm getting closer.

First, you need a handy path to the Sublime binary:

mkdir ~/bin
ln -s "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" ~/bin/subl

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!

Saberio

Totally forgot I posted this question. I managed to get sublime fired off from my source control, but it wasn't very slick, kept leaving files open that it shouldn't have and wasn't a very nice experience all told. I don't think sublimemerge is really up to the job. – Guzzle

I'm using sublime and sublimerge but using sublime for mergetool juts open both version in a splitted window not using sublimerge. Do you managed to open both versions in sublimerge or in standard sublime splitted window ? – Sled

No, like you are seeing it they were in a standard split window in sublime. I then had to use a certain key combination to select and open the right files in sublimerge. Which was a right faff as I'd often have multiple docs already open in sublime and then have to select the right ones. Considering sublime is hailed in some circles as a the bee's knees I'm a bit surprised that there isn't a proper story re merging. – Guzzle