Geek asks and answers

Does git keep cherry picks any metadata?

Given the commit that cherry selected to the master from the branch, then this branch merges back into master:

How does git know that changes coming from a previous cherry pick should not be confronted with changes from a merge? Is there any metadata stored with commit cherry?

+5
source share
1 answer

No, and nothing special about the cherry picking act. Git always notices when the same change was made on either side of the merger. The charges should not even look alike; as long as a piece of text starts in the same way and ends in the same way, there is no reason to mark it as a conflict.

+5
source

More articles:


All Articles