GIT Cherry-picking one commit X times

435 views Asked by At

I'm facing a strange behaviour with some commits on my SVN migrated GIT repository: I tried to cherry-pick onto a release branch a commit from the master that had been previously already merged onto the release branch with SVN. GIT did not detect it and added the code a second time in the source file modified. I was then able to cherry-pick it again and again and again and each time GIT added the commit code again !

In SVN, the merge property of the revision from master to the release branch is well saved.

This behaviour happens on only a few commit upon our 22K commits

Is there a direction onto which I should investigate to determine where this problem comes from ?

0

There are 0 answers