Re: Dynamic loading progress

[Yuri Khan]

On Mon, Nov 9, 2015 at 4:40 PM, Aurélien Aptel
<address@hidden> wrote:

> I already merged master in my branch at some point, and did so with
> `merge --squash` IIRC, note to self: never do that again.

Merge --squash is history rewriting, with all of the consequences thereof.

> Turns out it
> made any subsequent master merge a lot harder, sorry for that. The
> weird thing is most conflicting changes where actually identical but
> git couldn't tell. The diff were the same on both side but git couldnt
> tell they were from the same commits since they were squashed.

Typical symptoms of merging a branch with a rebased version of itself.