4 down vote accepted You can manually delete .git/MERGE_HEAD and Git won't be able to tell that you were just doing a merge. It will let you amend the previous commit with the changes in your index just like normal.

U1and0 のブックマーク 2016/08/06 11:43

<blockquote class="hatena-bookmark-comment"><a class="comment-info" href="https://b.hatena.ne.jp/entry/297133145/comment/U1and0" data-user-id="U1and0" data-entry-url="https://b.hatena.ne.jp/entry/s/stackoverflow.com/questions/22135465/cant-commit-after-starting-a-merge-in-sourcetree" data-original-href="https://stackoverflow.com/questions/22135465/cant-commit-after-starting-a-merge-in-sourcetree" data-entry-favicon="https://cdn-ak2.favicon.st-hatena.com/64?url=https%3A%2F%2Fstackoverflow.com%2Fquestions%2F22135465%2Fcant-commit-after-starting-a-merge-in-sourcetree" data-user-icon="/users/U1and0/profile.png">Cant commit after starting a merge in Sourcetree</a><ul class="comment-tag" style="list-style: none; margin: 0px;"><li style="float: left">[<a href="https://b.hatena.ne.jp/q/merge">merge</a>]</li><li style="float: left">[<a href="https://b.hatena.ne.jp/q/commit">commit</a>]</li><li style="float: left">[<a href="https://b.hatena.ne.jp/q/git">git</a>]</li><li style="float: left">[<a href="https://b.hatena.ne.jp/q/error">error</a>]</li></ul><br><p style="clear: left"> 4 down vote accepted You can manually delete .git/MERGE_HEAD and Git won't be able to tell that you were just doing a merge. It will let you amend the previous commit with the changes in your index just like normal.</p><a class="datetime" href="https://b.hatena.ne.jp/U1and0/20160806#bookmark-297133145"><span class="datetime-body">2016/08/06 11:43</span></a></blockquote><script src="https://b.st-hatena.com/js/comment-widget.js" charset="utf-8" async></script>

このブックマークにはスターがありません。
最初のスターをつけてみよう！