git cherry-pick picks too much
Has anybody else figured out strange behavior of
I have a big repository and just cherry picked a commit from another branch. The cherry picking resulted in conflicts. Then when resolving the conflicts I saw that the cherry pick introduced changes that where not made by the commit I picked nor part of
Could somebody please explain how git is working here? When does git pick more than the actual changes that where introduced by the commit to pick?
The file may diverged a lot in both branches..
My problem is less the current conflict but more that I might picked changes in the past that shouldn't come into that branch because git decided to introduce older changes too.
I'm sorry for the confusion, but by now I'm really confused and need help understanding what git did here..
So my main question is, should I worry about cherry picks that git didn't complain about? Can I be sure that git just picked the changes introduced by the commit to pick?
And the second question is: When does git put changes into the conflict state of the file that where neither part of the
HEAD file nor part of the commit to pick.
Thanks in advance!
No responses yet. Be the first one!
Can you answer these?
- Answer CD/DVD doesn't work on gateway NV53 running windows 7
- Answer i used the microsoft fixit program to troubleshoot explorer8 for add-on problems...the result was a long list of unfamiliar toolbars that i cant find anywhere...
- Answer I Have A Highlight Tape That I Need To Burn Onto A Disk. It Keeps Saying "The File Is Too Large To Fit Even Though It's Only 4:40 Long. Help Please?
- Answer Can a grey fox and Arctic fox live together in the same man made environment as in an animal reserve without fighting?
- Answer What are the lines on the globe called?