From: Jay Soffian <jaysoffian@gmail.com>
Date: Thu, 19 Feb 2009 20:26:48 GMT
Subject: Re: git merge --abort
Message-ID: <76718490902191226k7b87f478p9a79b9b2372b464d@mail.gmail.com>
In-Reply-To: <43d8ce650902190534j49e24f86k9b716190ae3d134b@mail.gmail.com>

On Thu, Feb 19, 2009 at 8:34 AM, John Tapsell <johnflux@gmail.com> wrote:
> There's no reliable way of getting back to the state before the merge?

Sure there is. Commit or stash before you merge, so that your index
and working copy are clean.

j.