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

Merge conflicts are reported relative to root not cwd

From
Stefan Beller <sbeller@google.com>
Date
Apr 13, 2016, 21:37 UTC
Message-ID
<CAGZ79kbVfk=yAK3UB=H385_YfAtMHZe-gSE=EYVvvcS8jjy08A@mail.gmail.com>

$ cd t/ $ git merge ... ... Auto-merging builtin/submodule--helper.c Auto-merging builtin/fetch.c CONFLICT (content): Merge conflict in builtin/fetch.c Auto-merging builtin/clone.c Auto-merging README.md ...

It should say ../builtin/fetch.c IMHO. Any reason to keep the old behavior?

Thanks, Stefan

Next: Junio C Hamano
Message 1 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.