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

[François Suter]

Hi all,

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?

Cheers

-- 

Francois Suter
Cobweb Development Sarl - http://www.cobweb.ch