【发布时间】:2014-02-12 16:11:17
【问题描述】:
我在我的热修复分支上,我刚刚做了 git add . 和 git commit -m "adding well style"
然后我做了:
johns-mbp:blackjack johncurry$ git checkout master
Switched to branch 'master'
johns-mbp:blackjack johncurry$ git merge hotfix
Auto-merging views/stay.erb
error: cannot run Sublime_Text_2: No such file or directory
error: unable to start editor 'Sublime_Text_2'
Not committing merge; use 'git commit' to complete the merge.
johns-mbp:blackjack johncurry$ git commit -m "added well style"
[master 91c3bfd] added well style
然后我在我的 master 分支上推送到 github,一切正常,就好像它成功合并一样,在 github 上我什至有我对 hot fix 分支所做的更新,并完全按照我想要的方式合并。但是下面的部分让我很震惊,这是怎么回事,我该如何摆脱它?
error: cannot run Sublime_Text_2: No such file or directory
error: unable to start editor 'Sublime_Text_2'
Not committing merge; use 'git commit' to complete the merge.
【问题讨论】:
标签: macos git merge terminal commit