From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Fri, 25 Dec 2009 14:32:03 GMT
Subject: Re: You have local changes; cannot switch branches error question
Message-ID: <vpqpr63cefw.fsf@bauges.imag.fr>
In-Reply-To: <7vhbrghrsn.fsf@alter.siamese.dyndns.org>

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/