Sublime Forum

Editing commit message on merge

#1

I set up Sublime Merge as a default git editor. Now, when I merge master branch to the current, the merge is seamless, but I don’t get a chance to edit a automatic commit message. Instead I see the Sublime Merge window popping up with blank commit on top of the merge commit.

Could you provide some comment of why this is happening?

I’d rather see the window with the option to edit the merge commit message or no popup at all.

screenshot.jpg1100×161 79.4 KB

0 Likes
#2

SM is not a git editor, it is a git client. I take it you did something like the following? EDITOR=smerge git merge 20181125-orgs-bs-store

Or did you initiate the merge from within SM?

0 Likes
#3

I guess, this answers the question. The commit was initiated from the command line:
$ git merge origin/master

smerge is set up as an editor in .gitconfig (~/bin/smerge is an alias to smerge on Mac)

[core]
	# editor = vim
	editor = ~/bin/smerge
0 Likes