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

Re: Keeping two repos in sync

From
Andreas Schwab <schwab@linux-m68k.org>
Date
Sep 9, 2012, 09:03 UTC
Message-ID
<m2fw6rlgaa.fsf@igel.home>
In-Reply-To
<CACffvTryOcefmqNdJ00TuDPov+TpRZRvZ46UDV-8F_cdp80SgA@mail.gmail.com>
David Chanters <david.chanters@googlemail.com> writes:
Show 6 quoted lines
> 2.  At this point I scan the two branches looking for a point to
> graft; I might have done this already in the past, but the point is
> since grafting is a local operation and I am not working in that
> repository, I might need to do it again anyway -- that graft
> represents a way of tieing the branches together at a point I can then
> "git merge".

You can "git merge -s ours" that grafting point, assuming "portable" completely subsumes "bsd" at that point. Future merges should then be working normally.

Andreas.
-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Previous: David Chanters
Message 4 of 4 in “Keeping two repos in sync”
  1. David ChantersSep 9, 2012
  2. Andreas SchwabSep 9, 2012
  3. David ChantersSep 9, 2012
  4. Andreas SchwabSep 9, 2012

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.