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

Re: Best way to merge two repos with same content, different history

From
Markus Heidelberg <markus.heidelberg@web.de>
Date
Jun 5, 2009, 17:15 UTC
Message-ID
<200906051915.56115.markus.heidelberg@web.de>
In-Reply-To
<63BEA5E623E09F4D92233FB12A9F794303117DBF@emailmn.mqsoftware.com>
Kelly F. Hickel, 05.06.2009:
> 	Other than using manually format-patch on every branch in new,
> then applying the patches (presumably with regular old patch, since the
> ancestor commit IDs won't match), is there any "good" way to merge "new"
> into "old"?
If rebasing 'new' on top of 'old' isn't an option, then you could try:
    $ git checkout new
    $ git merge -s ours old

It's the other way round (not merging 'new' into 'old', but vice versa), but there is now merge strategy "theirs".

Markus
Previous: Kelly F. Hickel
Message 12 of 12 in “Best way to merge two repos with same content, different history”
  1. Kelly F. HickelJun 5, 2009
  2. Rostislav SvobodaJun 5, 2009
  3. Kelly F. HickelJun 5, 2009
  4. Rostislav SvobodaJun 5, 2009
  5. Robin H. JohnsonJun 5, 2009
  6. Kelly F. HickelJun 5, 2009
  7. Robin H. JohnsonJun 5, 2009
  8. Kelly F. HickelJun 5, 2009
  9. Michael HaggertyJun 19, 2009
  10. Avery PennarunJun 5, 2009
  11. Kelly F. HickelJun 5, 2009
  12. Markus HeidelbergJun 5, 2009

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.