[TYPO3-core] Git cherry-picking and conflicts?
fsu-lists at cobweb.ch
Fri May 27 15:00:18 CEST 2011
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?
Cobweb Development Sarl - http://www.cobweb.ch
More information about the TYPO3-team-core