Re: Dynamic loading progress

[Aurélien Aptel]

On Mon, Nov 9, 2015 at 2:47 PM, Steinar Bang <address@hidden> wrote:
>> If Ted is going to do the job he has basically two choices:
>>  - Preserve all history of the branch
>>  - Squash all history of the branch into a single commit
>
> (And I personally wouldn't have tried squashing after I have merged in
> from master)

After merging master in the branch i can simply use a diff between the
2 (which shouldnt include conflicting/redundant changes this time) as
what I'll use to make the new clean branch.