Re: [Flightgear-devel] MiG-15 patches

[James T. <ja...@fl...>]

> On 10 Dec 2020, at 10:26, Michael Danilov <mik...@gm...> wrote:
> 
>> When using a ‘review-aware-GUI’ (Gerrit, GitHub, etc) I would recommend to amend or fix+squash the original patch, but for our workflow on SF that can be tricky.
>> 
>> Either way, make sure you squash into ‘feature-sized pieces' before doing the final merge, of course.
>> 
>> Kind regards,
>> James
> 
> Does that correspond to `$ git rebase -i` and putting "fixup" and "squash”?

Yes, exactly. 

As ever, just be careful since ‘git rebase -i’ can make a mess, but you can ‘git rebase —abort’ if it breaks half way through. Once it’s done, it’s done, however.

But mostly it works fine: use ‘fixup’ to combine the fixes into the original change, and use ’squash’ to combine fixes. Once you squash, un-squashing is awkward, so just decide carefully. 

Kind regards,
James