From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 May 2009 03:21:02 GMT
Subject: Re: [Q] merge squash unexpected conflicts
Message-ID: <7v4ovo1iap.fsf@alter.siamese.dyndns.org>
In-Reply-To: <bb9d69200905131942t7a43a29fh9638d2548e9f12dc@mail.gmail.com>

Cory Sharp <cory.sharp@gmail.com> writes:

> Am I doing something a little wrong or unexpected?  Is there a way
> around this squash conflict behavior?  This doesn't seem to happen
> with plain merge without squash.

Of course.  That's the whole point of recording a merge as a merge.