[Development] Rebasing a contribution

[João Abecasis]

Oswald Buddenhagen wrote:
>> That's why I am asking that, if people are going to submit rebases,
>> submit ONLY the rebase, with no extra changes.
>> 
> well, that's noble, but it just won't happen in most cases. been there,
> tried it, didn't even get a t-shirt.

How about this, you decide to rebase your changes (master updated, feature Z integrated, you're that cool). Before you do, you ask yourself: "Have I changed the commit at all since I last submitted?" (Even if you don't really make the question, you should at least know the answer ;-) If so or in doubt, submit again, so reviewers can see what changed before the rebase.

Rebase and re-submit (unconditionally). If there are non-trivial conflict resolutions in the process you can make a note of those in either comments in Gerrit or the commit message if it makes sense.

For simple enough patches this is probably all overkill.

Either way, in the end it is expected that reviewers have a clear understanding of the full final patch that is accepted. If there's anything you can do make it easier for them to accept your patch, please do ;-)

Cheers,


João