git cherry-pick weird issue, sometimes conflicts but sometimes not
问题 Let's say we have below history: master->m2 s2<-second | | m1 s1 \ / a0 so a0 is the initial commit that has a text file called letter.txt that contain a letter a , each commit on the master branch append the next alphabet, so the letter.txt in m1 contains ab and m2 contains abc , then I checkout the second branch and on I add a new file let's say bugfixcode.cs , so s1 and s2 are all in regards to add/modify bugfixcode.cs , then I switch back to master , and find I want to cherry-pick some