[TYPO3-core] "cherry-pick to" feature in Gerrit

[Philipp Gampe]

Hi Markus,

Markus Klein wrote:

> Nevertheless because you mentioned it here I just remembered that the
> cherry-picking of Gerrit seems to work different some way. I had a patch
> which couldn't be applied by the cherry-pick feature, but a local
> cherry-pick worked just fine. I can't remember which patch it was, but
> there's obviously a different behavior.

If you do it locally, then git can use rerere and your local history to 
resolving. You just have more information there ... git is really smart 
about this.

Best regards
-- 
Philipp Gampe – PGP-Key 0AD96065 – TYPO3 UG Bonn/Köln
Documentation – Active contributor TYPO3 CMS
TYPO3 .... inspiring people to share!