git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Merge conflicts are reported relative to root not cwd

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 13, 2016, 22:40 UTC
Message-ID
<xmqqvb3li14k.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CAGZ79kZSyLZxMXSSv=uDpuA0zTUy6nU4vwEF5f7WLhoRp1hXig@mail.gmail.com>
Stefan Beller <sbeller@google.com> writes:
> * .... What are
>    whole-tree operations?

"git merge" does not let you merge "changes just in my current directory". You only merge the whole tree, and you can get conflicts from all over the tree, not just in your current directory.

Previous: Stefan BellerNext: Jeff King
Message 4 of 7 in “Merge conflicts are reported relative to root not cwd”
  1. Stefan BellerApr 13, 2016
  2. Junio C HamanoApr 13, 2016
  3. Stefan BellerApr 13, 2016
  4. Junio C HamanoApr 13, 2016
  5. Jeff KingApr 13, 2016
  6. Stefan BellerApr 13, 2016
  7. Eric DeplagneApr 14, 2016

Read the whole thread, see it on lore, or plain text.

$ 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.