Re: Switching branches without committing changes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux