[TYPO3-core] Git cherry-picking and conflicts?

[Ernesto Baschny [cron IT]]

François Suter schrieb am 27.05.2011 15:00:

> New Git question: I cherry-picked a patch from Gerrit and applied it to
> some local branch. The patch resulted in a conflict, which I resolved by
> editing the file. But the problem is that the commit I cherry-picked was
> not applied at all, because of the conflict. How do I amend it now?

As soon as you cherry-pick and there are conflicts, the git
cherry-picking will inform you about how to finalize it after solving.

For example:

1) Do the cherry-pick and notice that there are conflicts: