Jeff King <peff@peff.net> writes:
> 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).
The thing is, that -m is really to mollify people who are _too_ accustomed
to CVS/SVN update behaviour. Over there, "scm update" does not give you
any choice other than having to merge.
This post is *yet* another valuable candidate to put onto the wiki.
Xavier