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

Re: resolve (merge) problems

From
Junio C Hamano <junkio@cox.net>
Date
Dec 2, 2005, 01:58 UTC
Message-ID
<7vpsog9s5e.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20051202015039.93047.qmail@web31811.mail.mud.yahoo.com>
Luben Tuikov <ltuikov@yahoo.com> writes:
> Ok, if your patch below resolves the bug (please see my
> other email just posted) please submit it.  (I'm hitting
> this bug everytime there's a file deleted from the
> kernel tree and I try to merge.)

Sorry to hear that. The patch I sent you is already pushed out and mirrored the public machines.

The failure from '-s recursive' (lack of heapq) makes me suspect that your Python installation is too old. The 'resolve' method you've been using should work fine for this case; otherwise replace '-s recursive' in the message from Linus with '-s resolve' for the 'git merge' commandline, like this:

	$ git merge -s resolve "merge linus' tree" HEAD master
Previous: Luben TuikovNext: Luben Tuikov
Message 6 of 11 in “resolve (merge) problems”
  1. Luben TuikovDec 1, 2005
  2. Junio C HamanoDec 1, 2005
  3. Luben TuikovDec 2, 2005
  4. Junio C HamanoDec 2, 2005
  5. Luben TuikovDec 2, 2005
  6. Junio C HamanoDec 2, 2005
  7. Luben TuikovDec 2, 2005
  8. Junio C HamanoDec 2, 2005
  9. Luben TuikovDec 2, 2005
  10. Linus TorvaldsDec 2, 2005
  11. Luben TuikovDec 2, 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.