From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Wed, 31 Mar 2010 03:58:20 GMT
Subject: Re: [PATCH] Clarification for the command "git checkout <branch>"
Message-ID: <p2nf3271551003302058ve6b54731h1bea42b5c6605928@mail.gmail.com>
In-Reply-To: <7vd3ylv4oq.fsf@alter.siamese.dyndns.org>

Hi,

On Wed, Mar 31, 2010 at 3:43 AM, Junio C Hamano <gitster@pobox.com> wrote:
> +such a case, you may want retry the command after recording the local
> +changes (1) in a temporary commit on the current branch, or (2) by using
> +"git stash".  Alternatively, use "-m" option to force a merge.

Couple of things: Is (1) really an option? The user will have to go
through documentation on rewriting history, which I find completely
unnecessary to just switch branches. Second, you might want to mention
a "git stash apply" and include a reference to git-stash
documentation.

-- Ram