From: Xavier Maillard <xma@gnu.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: peff@peff.net, spearce@spearce.org, joe@faithfulgeek.org,
git@vger.kernel.org
Subject: Re: Switching branches without committing changes
Date: Sun, 23 Mar 2008 02:00:02 +0100 [thread overview]
Message-ID: <200803230100.m2N102oR025238@localhost.localdomain> (raw)
In-Reply-To: <7vod98u1pr.fsf@gitster.siamese.dyndns.org> (message from Junio C Hamano on Thu, 20 Mar 2008 21:42:56 -0700)
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
--
http://www.gnu.org
http://www.april.org
http://www.lolica.org
next prev parent reply other threads:[~2008-03-23 1:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-21 3:27 Switching branches without committing changes Joe Fiorini
2008-03-21 3:52 ` Jeff King
2008-03-21 4:06 ` Shawn O. Pearce
2008-03-21 4:10 ` Jeff King
2008-03-21 4:40 ` Joe Fiorini
2008-03-21 4:42 ` Junio C Hamano
2008-03-21 4:58 ` Joe Fiorini
2008-03-23 1:00 ` Xavier Maillard [this message]
2008-03-24 14:46 ` Joe Fiorini
2008-03-24 19:07 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200803230100.m2N102oR025238@localhost.localdomain \
--to=xma@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=joe@faithfulgeek.org \
--cc=peff@peff.net \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).