From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: Eugene Sajine <euguess@gmail.com>, git@vger.kernel.org
Subject: Re: You have local changes; cannot switch branches error question
Date: Fri, 25 Dec 2009 15:32:03 +0100 [thread overview]
Message-ID: <vpqpr63cefw.fsf@bauges.imag.fr> (raw)
In-Reply-To: <7vhbrghrsn.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Thu\, 24 Dec 2009 15\:32\:24 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> There are two ways to deal with this situation, one safely, and another
> quickly.
And a third one : commit, and then rebase onto the other branch. It's
safe, and nice when your local changes are ready to commit (then, you
can write the commit message before bothering about potential merge
conflicts).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
prev parent reply other threads:[~2009-12-25 14:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-24 22:25 You have local changes; cannot switch branches error question Eugene Sajine
2009-12-24 22:59 ` Nanako Shiraishi
2009-12-24 23:32 ` Junio C Hamano
2009-12-25 14:32 ` Matthieu Moy [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqpr63cefw.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=euguess@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).