From: Junio C Hamano <gitster@pobox.com>
To: "Yohann Bénédic" <yohann.benedic@orange.com>
Cc: git@vger.kernel.org
Subject: Re: Splitting a project into branches afterwards
Date: Wed, 04 May 2016 01:23:26 -0700 [thread overview]
Message-ID: <xmqqoa8mi64h.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <loom.20160503T090745-628@post.gmane.org> ("Yohann Bénédic"'s message of "Tue, 3 May 2016 15:20:44 +0000 (UTC)")
Yohann Bénédic <yohann.benedic@orange.com> writes:
> branch. If the framework branch moves forward, I want my product_A branch to
> be able follow along : that's a merge of the framework from product_A. In
> product_A, I might fix something from the framework and need to patch the
> latter. That's a merge in the other direction.
Instead of doing a mixed ball of wax on product specific branch,
can't you do the latter by (1) fix something that belongs to the
framework part of the system on the framework branch, (2) merge that
to product A branch, and then (3) use that fixed framework code to
update the product A? That way you would never have to merge
product specific part to the framework, which is meant to be product
agnistic (which is the whole point of your "initial removal" done on
the framework branch, if I am reading you correctly).
next prev parent reply other threads:[~2016-05-04 8:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-03 15:20 Splitting a project into branches afterwards Yohann Bénédic
2016-05-04 8:23 ` Junio C Hamano [this message]
2016-05-04 8:38 ` Junio C Hamano
2016-05-04 9:52 ` yohann.benedic
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=xmqqoa8mi64h.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=yohann.benedic@orange.com \
/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).