From: Jeff King <peff@peff.net>
Date: Fri, 21 Mar 2008 04:10:13 GMT
Subject: Re: Switching branches without committing changes
Message-ID: <20080321041013.GA2502@coredump.intra.peff.net>
In-Reply-To: <20080321040647.GE8410@spearce.org>

On Fri, Mar 21, 2008 at 12:06:47AM -0400, Shawn O. Pearce wrote:

> Use `git checkout -m` to switch the branch anyway.  However, if
> there is a merge conflict while you are trying to carry the changes
> to the other branch you may be faced with a merge conflict you are
> not prepared to resolve, or simply cannot resolve in a reasonable
> period of time.

Ah, for some reason I didn't think of '-m' in the advice I gave (I guess
I have just never used it). It is almost certainly simpler than using a
'stash' at this point (but I do think stashing _beforehand_ still has
advantages).

-Peff