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

Re: cg-merge should use git-merge

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Oct 20, 2005, 07:04 UTC
Message-ID
<46a038f90510200004l67e2d19kf8e9a4c6190f44f@mail.gmail.com>
In-Reply-To
<46a038f90510190421l50b2c12k495db23b62015782@mail.gmail.com>
On 10/20/05, Martin Langhoff <martin.langhoff@gmail.com> wrote:
> After using git-merge a few times by hand to test-drive the new merge
> drivers, I'm sold on the idea, and I 'd like to have cg-merge use
> git-merge directly.

I started drafting a 5-minute proof-of-concept, and then it struck me: cg users aren't aware of the index. This is really important when you are merging and have to resolve a conflict over a dirty tree. git users know that the "clean" part of the merge is in the index, and they have to resolve a couple of files in their checkout, and update the index for those only before calling git-write-tree & git-commit-tree.

Cogito users don't know about this magic at all, which is a bit of a problem. I can refuse to run cg-merge on a dirty tree to make things simpler, but that's cheating ;-)

tagging "for later"...
cheers,
martin
Previous: Martin Langhoff
Message 4 of 4 in “Re: cg-merge should use git-merge”
  1. Junio C HamanoOct 17, 2005
  2. Junio C HamanoOct 17, 2005
  3. Fwd: cg-merge should use git-mergeMartin Langhoff, Oct 19, 2005
  4. Martin LanghoffOct 20, 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.