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

Re: Effective difference between git-rebase and git-resolve

From
MWMark Wooding <mdw@distorted.org.uk>
Date
Mar 25, 2006, 11:08 UTC
Message-ID
<slrne2a94r.cp6.mdw@metalzone.distorted.org.uk>
In-Reply-To
<Pine.LNX.4.63.0603251034550.14457@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> I am nowhere near kernel people, but I am using git on a machine where it 
> is too cumbersome to install python. If git-resolve goes, I am without a 
> merge strategy (at least until git-recursive is ported to C... was that 
> not the plan with git-merge-tree? What happened on that front?).

Err... git-resolve isn't the same as git-merge-resolve. The latter is a stupid merge strategy which fits into the git-merge/git-pull infrastructure. The former is a different program which does merges badly, and you didn't want to use it even if you don't have Python!

I'd forgotten all about git-resolve until it got mentioned just now.
-- [mdw]
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 9 of 10 in “Effective difference between git-rebase and git-resolve”
  1. Marc SingerMar 25, 2006
  2. Linus TorvaldsMar 25, 2006
  3. Junio C HamanoMar 25, 2006
  4. Marc SingerMar 25, 2006
  5. Junio C HamanoMar 25, 2006
  6. J. Bruce FieldsMar 26, 2006
  7. Junio C HamanoMar 25, 2006
  8. Johannes SchindelinMar 25, 2006
  9. Mark WoodingMar 25, 2006
  10. Johannes SchindelinMar 25, 2006

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.