Comments on: Using a temporary branch when doing Git merges http://blog.mhartl.com/2008/10/28/using-a-temporary-branch-when-doing-git-merges/ Michael Hartl's tech blog Wed, 21 Dec 2011 11:47:00 +0000 hourly 1 http://wordpress.com/ By: Keith http://blog.mhartl.com/2008/10/28/using-a-temporary-branch-when-doing-git-merges/#comment-247 Fri, 15 Jan 2010 00:18:06 +0000 http://insoshi.wordpress.com/?p=202#comment-247 If you get stuck and decide to just give up and throw the whole mess away, you can always return to the pre-merge state with

{{{
$ git reset –hard HEAD
}}}

Or, if you’ve already committed the merge that you want to throw away,

{{{
$ git reset –hard ORIG_HEAD
}}}

However, this last command can be dangerous in some cases–never throw away a commit if that commit may itself have been merged into another branch, as doing so may confuse further merges.

]]>