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

Re: 'git notes merge' implementation questions

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Apr 22, 2010, 00:26 UTC
Message-ID
<20100422002641.GA29452@progeny.tock>
In-Reply-To
<201004220155.12747.johan@herland.net>
Johan Herland wrote:
> Thanks, I'm definitely coming around to the idea that having the user freely 
> resolve conflicts in a temporary worktree (that preferably contains only the 
> conflicting notes) is better than trying to resolve conflicts _without_ a 
> worktree.

Junio did a good job of making both interfaces --- no-resolution and resolution-in-a-worktree --- sound very appealing.

Thanks for the hard work, Jonathan

Previous: Johan HerlandNext: Junio C Hamano
Message 4 of 10 in “'git notes merge' implementation questions”
  1. Johan HerlandApr 21, 2010
  2. Jonathan NiederApr 21, 2010
  3. Johan HerlandApr 21, 2010
  4. Jonathan NiederApr 22, 2010
  5. Junio C HamanoApr 21, 2010
  6. Johan HerlandApr 22, 2010
  7. Junio C HamanoApr 22, 2010
  8. Johan HerlandApr 22, 2010
  9. Junio C HamanoApr 22, 2010
  10. Johan HerlandApr 22, 2010

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.