Re: Splitting a project into branches afterwards

From: Junio C Hamano <gitster@pobox.com>
Date: May 4, 2016, 08:23 UTC
Message-ID: <xmqqoa8mi64h.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <loom.20160503T090745-628@post.gmane.org>

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).