My current branch is branch-X. I cherry-pick a commit Y from branch-Z and later plan to merge branch-Y into branch-X. Will commit Y be applied again during the merge?
Matthias
No, git is clever enough that when you merge branches it does not re-apply patches that founds are already applied.
You can try that with rebasing the branch with the commit from where you cherry-picked it (your branch-Z) into the branch you cherry-picked it (branch-X).