Re: "git merge" merges too much!

From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Dec 2, 2009, 10:20 UTC
Message-ID: <20091202192021.6117@nanako3.lavabit.com>
In-Reply-To: <m1NFXpl-000knKC@most.weird.com>

Quoting "Greg A. Woods" <woods@planix.com> writes:

Show 11 quoted lines

> At Mon, 30 Nov 2009 22:22:12 +0300, Dmitry Potapov <dpotapov@gmail.com> wrote:
> Subject: Re: "git merge" merges too much!
>> 
>> The key difference comparing to what you may got used is that branches
>> are normally based on the oldest branch in what this feature may be
>> included. Thus normally changes are not backported to old branches,
>> because you can merge them directly.
>
> Hmmm... the idea of creating topic branches based on the oldest branch
> where the feature might be used is indeed neither intuitive, nor is it
> mentioned anywhere I've so far read about using topic branches in Git.

You may want to add the result of googling

  "Fun with" site:gitster.livejournal.com

to the list of Git documents you read. "Fork from the oldest branch" is one of the techniques Junio teaches often and many of his other techiniques are built upon.

He not just teaches useful techniques but explains a lot about the reasoning behind them in his Git book. His blog articles have the same explanations on many topics I saw in his book but not in other places. It is a useful substitute until his book gets translated to English for people who don't read Japanese.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/