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

Re: Sharing a massive distributed merge

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 17, 2011, 20:54 UTC
Message-ID
<7vd3lp31tw.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110317191517.GC20508@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 5 quoted lines
> It would be neat if the tree could somehow mark a bit for "this is
> unresolved". I guess we could shove it into a mode bit. But that seems
> like a waste of a mode bit for this one use case that doesn't come up
> all that often, and which doesn't _need_ to represent that information
> in-tree. The commit-message solution would work perfectly fine.

Just adding the blob with the whole glory of <<</>>> markers would be better than recording --ours or --theirs. Deleting might be a workaround that would work better in practice as somebody already mentioned, though.

I agree that message is an essential part of the communication medium to coordinate this kind of workflow. It is not like the downstream is a dumb machinery that blindly grab and overlay the partial merge results that can only read from tree objects and not commit messages.

Previous: Alex RiesenNext: Victor Engmark
Message 15 of 17 in “Sharing a massive distributed merge”
  1. Joshua JensenMar 16, 2011
  2. Jay SoffianMar 17, 2011
  3. Jeff KingMar 17, 2011
  4. Jay SoffianMar 17, 2011
  5. Jeff KingMar 17, 2011
  6. Jeff KingMar 18, 2011
  7. Joshua JensenMar 24, 2011
  8. Alex RiesenMar 17, 2011
  9. Jay SoffianMar 17, 2011
  10. Alex RiesenMar 17, 2011
  11. Jay SoffianMar 17, 2011
  12. Alex RiesenMar 17, 2011
  13. Jeff KingMar 17, 2011
  14. Alex RiesenMar 17, 2011
  15. Junio C HamanoMar 17, 2011
  16. Where do all the tips go? (Was: Re: Sharing a massive distributed merge)Victor Engmark, Mar 17, 2011
  17. Jeff KingMar 17, 2011

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.