From: Andreas Schwab <schwab@linux-m68k.org>
To: David Chanters <david.chanters@googlemail.com>
Cc: git@vger.kernel.org
Subject: Re: Keeping two repos in sync
Date: Sun, 09 Sep 2012 11:03:09 +0200 [thread overview]
Message-ID: <m2fw6rlgaa.fsf@igel.home> (raw)
In-Reply-To: <CACffvTryOcefmqNdJ00TuDPov+TpRZRvZ46UDV-8F_cdp80SgA@mail.gmail.com> (David Chanters's message of "Sun, 9 Sep 2012 09:44:05 +0100")
David Chanters <david.chanters@googlemail.com> writes:
> 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."
prev parent reply other threads:[~2012-09-09 9:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-09 8:12 Keeping two repos in sync David Chanters
2012-09-09 8:36 ` Andreas Schwab
2012-09-09 8:44 ` David Chanters
2012-09-09 9:03 ` Andreas Schwab [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2fw6rlgaa.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=david.chanters@googlemail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).