Re: [Q] merge squash unexpected conflicts
On Wed, May 13, 2009 at 8:21 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 8 quoted lines
> 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.
>
$ git help merge
--squash
Produce the working tree and index state as if a real merge
happened. ... This allows you to create a
single commit on top of the current branch whose effect is
the same as merging another branch.