From: Cory Sharp <cory.sharp@gmail.com>
Date: Thu, 14 May 2009 06:34:24 GMT
Subject: Re: [Q] merge squash unexpected conflicts
Message-ID: <bb9d69200905132334m7a4e3a4akde3529abeab5a09@mail.gmail.com>
In-Reply-To: <7veiusz45w.fsf@alter.siamese.dyndns.org>

On Wed, May 13, 2009 at 9:42 PM, Junio C Hamano <gitster@pobox.com> wrote:
> What's your point?

I am asking for help and understanding.

> WIth --squash, the tree and the index state becomes the same as if a real
> merge happened.  But the merge history is discarded with --squash.  It is
> a simulation of a merge in CVS and SVN (before they added "merge tracking").
>
> If you want support for repeated merges by merge tracking, you do not want
> todiscard the merge history by using --squash.

Why doesn't --squash do merge tracking?  The help didn't indicate that
it doesn't, and I don't understand why it shouldn't -- since I *could*
track the previous merge point manually and do "git diff --binary
PREV_MERGE..NEXT_MERGE | git apply -" to do the merge myself.

But since that's me manually performing merge tracking, why doesn't
"merge --squash" track like just "merge" does?  If I didn't want
tracking, I would expect to use some other command than "git merge
[options]".

Thanks for your help,
Cory