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
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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).