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

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 17, 2010, 19:23 UTC
Message-ID: <7vfx3yiwgm.fsf@alter.siamese.dyndns.org>
In-Reply-To: <b4087cc51003171150g303cf1c0uf2e0227594eef3fc@mail.gmail.com>

Michael Witten <mfwitten@gmail.com> writes:

Show 5 quoted lines

> On Wed, Mar 17, 2010 at 13:37, Junio C Hamano <gitster@pobox.com> wrote:
>> such local changes may conflict with the change
>> made between A and B, and stops the command.
>
> I'm sensing that it needs to be clarified what a conflict is.

Hmm, a conflict is "you changed it in one way, and I am trying to change the same thing in another way, you two have to fight it out". What other interpretations are there, especially in a context of SCM?

I wouldn't mind a patch to add the definition to glossary, though.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.