Re: [PATCH] Clarification for the command "git checkout <branch>"

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 17, 2010, 18:37 UTC
Message-ID: <7v8w9qkd5z.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4BA11D8C.5020007@web.de>

Markus Elfring <Markus.Elfring@web.de> writes:

Show 7 quoted lines

>>      If you made changes to paths that are different from the current
>> branch and the new branch, the command will stop you in order to prevent
>> you from losing your uncommited changes in potential conflicts between
>> them and the changes between two branches.
>
> I find it hard to realise what will be inside or outside of a path structure
> under the mentioned conditions.

Sorry, but I didn't say anything about path structure, and I am unsure what you were talking about. Here is what I meant:

Imagine you are on branch A and trying to switch to branch B. There are changed paths between these two branches (i.e. the paths that appear in the output from "git diff --name-only A B") and there are unchanged paths. If you have local changes to the former, such local changes may conflict with the change made between A and B, and stops the command.