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

Re: Guided merge with override

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 18, 2008, 16:31 UTC
Message-ID
<7viqw6zovi.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<alpine.DEB.1.00.0806181627260.6439@racer>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Thinking about this again, there could be a problem: in case of complex 
> merges, it is possible that the sides are switched around for an 
> intermediate merge.  IOW you'd expect it to take "theirs", but it really 
> takes "ours".
Are you thinking about using this in merge-recursive?

I do not think there is any reason to use this during intermediate merges done inside merge-recursive. The point of recursive merge is to create a neutral intermediate merge result, with conflicts and all. Do this only during the final round and you are fine (for some definition of "fine" --- I still have not heard a convincing argument as to why it is even a good thing to be able to take one side for only parts that did conflict, while taking the change from the other side in places that did not).

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 10 of 22 in “Guided merge with override”
  1. Geoff RussellJun 16, 2008
  2. Miklos VajnaJun 16, 2008
  3. Johannes SixtJun 16, 2008
  4. Miklos VajnaJun 16, 2008
  5. Sverre RabbelierJun 16, 2008
  6. Geoff RussellJun 16, 2008
  7. Junio C HamanoJun 17, 2008
  8. Johannes SchindelinJun 18, 2008
  9. Johannes SchindelinJun 18, 2008
  10. Junio C HamanoJun 18, 2008
  11. Johannes SchindelinJun 18, 2008
  12. 1/2 git-merge-file --ours, --theirsJunio C Hamano, Jun 20, 2008
  13. 2/2 git-merge-recursive-{ours,theirs}Junio C Hamano, Jun 20, 2008
  14. Johannes SchindelinJun 20, 2008
  15. Junio C HamanoJun 21, 2008
  16. Johannes SchindelinJun 21, 2008
  17. Jakub NarebskiJun 21, 2008
  18. Johannes SixtJun 17, 2008
  19. Sverre RabbelierJun 17, 2008
  20. Johannes SchindelinJun 17, 2008
  21. Sverre RabbelierJun 17, 2008
  22. Johannes SchindelinJun 17, 2008

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.