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

Re: [PATCH 6/6] Add a new test for using a custom merge strategy

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 28, 2008, 13:12 UTC
Message-ID
<alpine.DEB.1.00.0807281506510.2725@eeepc-johanness>
In-Reply-To
<03fa2187a72957d98d63ab899b39e9adc2edfe99.1217207602.git.vmiklos@frugalware.org>
Hi,
On Mon, 28 Jul 2008, Miklos Vajna wrote:
> Testing is done by creating a simple git-merge-theirs strategy which is 
> the opposite of ours. Using this in real merges is not recommended but 
> it's perfect for our testing needs.

Note that what was asked for, and what Junio implemented before deciding that it would do more harm than good in git.git, is not the same as what you provide.

Your -theirs is a strict opposite of -ours, i.e. the tree after the merge will be identical to the "merged" branch's tip's.

The -theirs which was asked for (and which I truly think is insane) wanted to do a merge, and in case of merge conflicts take the "upstream" version _only of the conflicting hunks_.

Just to make sure everyone grasps why this is bad:
- there is not only a real chance, but a high probability that a merge 
  conflict means that some related, unconflicting change relies on _one_ 
  version of the conflicting hunk which might very well be "ours", and
- since we have a _recursive_ merge, the notion of "upstream" is 
  completely bogus when working on any merge that has more than one merge 
  base.  This merge would succeed, but actively be wrong.

Just to make sure people do not have to ask for that version of "-theirs" again, Dscho

Previous: Miklos VajnaNext: Miklos Vajna
Message 33 of 46 in “Allow custom merge strategies”
  1. 0/7 Allow custom merge strategiesMiklos Vajna, Jul 26, 2008
  2. 1/7 Make is_git_command() usable outside builtin-helpMiklos Vajna, Jul 26, 2008
  3. t7601: extend the 'merge picks up the best result' testMiklos Vajna, Jul 26, 2008
  4. 2/7 builtin-help: change the current directory back in list_commands_in_dir()Miklos Vajna, Jul 26, 2008
  5. 3/7 builtin-help: make list_commands() a bit more genericMiklos Vajna, Jul 26, 2008
  6. 4/7 builtin-merge: allow using a custom strategyMiklos Vajna, Jul 26, 2008
  7. 5/7 Add a new test for using a custom merge strategyMiklos Vajna, Jul 26, 2008
  8. 6/7 builtin-help: make it possible to exclude some commands in list_commands()Miklos Vajna, Jul 26, 2008
  9. 7/7 builtin-merge: avoid non-strategy git-merge commands in error messageMiklos Vajna, Jul 26, 2008
  10. Johannes SchindelinJul 26, 2008
  11. Miklos VajnaJul 26, 2008
  12. 7/7 builtin-merge: avoid non-strategy git-merge commands in error messageMiklos Vajna, Jul 26, 2008
  13. Johannes SchindelinJul 26, 2008
  14. Miklos VajnaJul 26, 2008
  15. Johannes SchindelinJul 26, 2008
  16. builtin-merge: avoid non-strategy git-merge commands in error messageMiklos Vajna, Jul 26, 2008
  17. Jonathan NiederJul 26, 2008
  18. 3/7 builtin-help: make list_commands() a bit more genericMiklos Vajna, Jul 26, 2008
  19. Johannes SchindelinJul 26, 2008
  20. Junio C HamanoJul 27, 2008
  21. Johannes SchindelinJul 27, 2008
  22. Avoid chdir() in list_commands_in_dir()Johannes Schindelin, Jul 27, 2008
  23. Miklos VajnaJul 26, 2008
  24. Jonathan NiederJul 26, 2008
  25. Miklos VajnaJul 28, 2008
  26. 0/6 Allow custom merge strategies, take 2Miklos Vajna, Jul 28, 2008
  27. 1/6 builtin-help: make is_git_command() usable outside builtin-helpMiklos Vajna, Jul 28, 2008
  28. 2/6 builtin-help: make list_commands() a bit more genericMiklos Vajna, Jul 28, 2008
  29. 3/6 builtin-help: make it possible to exclude some commands in list_commands()Miklos Vajna, Jul 28, 2008
  30. 4/6 builtin-merge: allow using a custom strategyMiklos Vajna, Jul 28, 2008
  31. 5/6 builtin-merge: avoid non-strategy git-merge commands in error messageMiklos Vajna, Jul 28, 2008
  32. 6/6 Add a new test for using a custom merge strategyMiklos Vajna, Jul 28, 2008
  33. Johannes SchindelinJul 28, 2008
  34. 6/6 Add a new test for using a custom merge strategyMiklos Vajna, Jul 28, 2008
  35. Johannes SchindelinJul 28, 2008
  36. Miklos VajnaJul 28, 2008
  37. Miklos VajnaJul 29, 2008
  38. Johannes SchindelinJul 28, 2008
  39. builtin-merge: allow using a custom strategyMiklos Vajna, Jul 28, 2008
  40. Johannes SchindelinJul 28, 2008
  41. Junio C HamanoJul 28, 2008
  42. Johannes SchindelinJul 28, 2008
  43. Junio C HamanoJul 28, 2008
  44. Junio C HamanoJul 28, 2008
  45. Johannes SchindelinJul 28, 2008
  46. 3/6 builtin-help: make it possible to exclude some commands in list_commands()Miklos Vajna, Jul 28, 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.