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

Re: Problem merging

From
LTLuben Tuikov <ltuikov@yahoo.com>
Date
Nov 23, 2005, 03:41 UTC
Message-ID
<20051123034140.29993.qmail@web31801.mail.mud.yahoo.com>
In-Reply-To
<7v4q6483ms.fsf@assigned-by-dhcp.cox.net>
--- Junio C Hamano <junkio@cox.net> wrote:
> What does "git diff" and "git diff HEAD" tell you after the
> merge procedure leaves conflict in the working tree (branchB
> directory, I mean)?

Apparently include/asm-um/ldt.h has been renamed and this was giving problems.

I had to manually git-update-index --force-remove that file and then git resolve worked ok.

   Luben
Previous: Junio C HamanoNext: Johannes Schindelin
Message 3 of 10 in “Problem merging”
  1. Luben TuikovNov 23, 2005
  2. Junio C HamanoNov 23, 2005
  3. Luben TuikovNov 23, 2005
  4. Johannes SchindelinNov 23, 2005
  5. Ben CliffordNov 24, 2005
  6. Johannes SchindelinNov 25, 2005
  7. Andreas EricssonNov 25, 2005
  8. H. Peter AnvinNov 27, 2005
  9. Fredrik KuivinenNov 23, 2005
  10. Junio C HamanoNov 23, 2005

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.