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

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

From
SRSverre Rabbelier <alturin@gmail.com>
Date
Jul 28, 2008, 19:52 UTC
Message-ID
<bd6139dc0807281252y650b9347md1d4ac788151d19f@mail.gmail.com>
In-Reply-To
<alpine.DEB.1.00.0807282008470.8986@racer>

On Mon, Jul 28, 2008 at 21:09, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

> Well, I have to say that the workflow is a bit backwards if the person who
> _publishes_ the thing is the one saying "Ooops, my version no goodie,
> other version please, but so that pull still works".

Why so? In this case the other branch was also owned by the publishing person. I don't quite follow how this is any stranger than ours? (Which is stranger to me, why would you want to merge in a branch if you're not going to do anything with it anyway? I'm sure there are valid workflows for it, which is why we have it, just saying that I think 'theirs' makes more sense to me than 'ours')

> I would have expected the one who has the good version to make the choice.

Why have the person with the good version merge with... a bad version? Isn't it usually "I will merge with you, because I know your branch makes things go twice as fast" (paraphrasing Linus from his git talk at google).

-- 
Cheers,

Sverre Rabbelier
Previous: Jeff KingNext: Junio C Hamano
Message 19 of 28 in “theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy”
  1. Sverre RabbelierJul 28, 2008
  2. Miklos VajnaJul 28, 2008
  3. Sverre RabbelierJul 28, 2008
  4. Jeff KingJul 28, 2008
  5. Johannes SchindelinJul 28, 2008
  6. Jeff KingJul 28, 2008
  7. Avery PennarunJul 28, 2008
  8. Johannes SchindelinJul 28, 2008
  9. Sverre RabbelierJul 29, 2008
  10. Jeff KingJul 29, 2008
  11. Jeff KingJul 29, 2008
  12. Johannes SchindelinJul 29, 2008
  13. Jeff KingJul 29, 2008
  14. Sverre RabbelierJul 29, 2008
  15. Junio C HamanoJul 29, 2008
  16. Jeff KingJul 29, 2008
  17. Mike RalphsonJul 29, 2008
  18. Jeff KingJul 29, 2008
  19. Sverre RabbelierJul 28, 2008
  20. Junio C HamanoJul 28, 2008
  21. Sverre RabbelierJul 28, 2008
  22. Junio C HamanoJul 28, 2008
  23. Sverre RabbelierJul 28, 2008
  24. Junio C HamanoJul 28, 2008
  25. Junio C HamanoJul 28, 2008
  26. Sverre RabbelierJul 28, 2008
  27. Jeff KingJul 29, 2008
  28. Junio C HamanoJul 29, 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.