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.
Given a commit that is cherry-picked into master from a branch, and later that branch is merged back into master:
How does git know that the changes coming from the previous cherry-pick should not collide with the changes from the merge? Is any sort of metadata saved with the cherry-picked commit?
No, and there’s nothing special about the act of cherry-picking, either. Git will always notice when the exact same change has been made on either side of a merge. The commits don’t even have to look anything alike; as long as some chunk of text started the same way and ended up the same way, there’s no reason to mark it as a conflict.