From: Cory Sharp <cory.sharp@gmail.com>
Date: Thu, 14 May 2009 18:25:23 GMT
Subject: Re: [Q] merge squash unexpected conflicts
Message-ID: <bb9d69200905141125i4a8ffaa8j6aea2a6c44de0c7d@mail.gmail.com>
In-Reply-To: <20090514070129.GL8212@noris.de>

On Thu, May 14, 2009 at 12:01 AM, Michael Radziej <mir@noris.de> wrote:
> git merge --squash is not a merge at all. ...
> It is useful only in very special circumstances.

You're right.  I (incorrectly) thought I had to use --squash to
properly interface with an svn branch and trunk through git-svn.  I
thought not using squash would trigger hundreds of commits - it
doesn't, nice things happen with just "merge".

Thanks everyone for helping me,
Cory