[TYPO3-core] Git: How to review a new version of a patch already applied to a local branch?

[Ernesto Baschny [cron IT]]

François Suter schrieb am 05.04.2011 18:04:
> Hi all,
> 
> Git question.
> 
> I am currently testing a large patch. To be safe I created a branch and
> applied it to that branch using the cherry-pick command provided by Gerrit.
> 
> Now there's a new version of that patch. What's the best way to test it?
> Can I apply it to my branch again? Or do I need to junk the branch
> first, create another one and apply the patch to that other branch?

If you want to cherry-pick the most recent one, I would first reset the
your branch head as if the "old patch" hasn't been applied.

Considering that the last commit is the old cherry-picked change (check
with "git log"), just reset to the previous state:

$ git reset HEAD^ --hard

And then just cherry-pick the new one (using the cmd-line from Gerrit).

There are probably other ways to do it.

If you try to cherry-pick "on top" of what you already have, you most
probably will get conflicts you will have to manually solve.

Cheers,
Ernesto