I recently hit unexpected conflicts when ruing a git cherry-pick:
git checkout myBranch
git cherry-pick begin..end
I thought "that makes no sense", aborted, and and tried the equivalent git rebase --onto:
git rebase --onto myBranch begin end
Voilà! A clean rebase, no unexpected conflicts.
Am I right to be surprised? Do you think there was user error somewhere, or is there a fundamental difference in the processes underlying rebase --onto and cherry-pick that could result in this?