There are two branches A, B, C. A was first merged into C. Then Using github desktop, I "cherry-pick" a few commits from A to B.
However, on github website, using branch comparison on A and B, I still see differences related to those "cherry-picked" commits. But if I open the file on both A and B, I see the contents are same.
Using git command line (Linux) to diff A and B, I don't see those difference (as expected).
Looking into the commit history of A and B, I found the SHA Id of each "cherry-picked" commit is different for same content between A and B. It seems "cherry-pick" creates new SHA id for each commit(a big surprise to me).
Now, my question is: am I able to merge from B to C ? Pull Request shows differences at places where are supposed to be the same content. It also shows "mergeable". I am worried I might run into merge conflict when I click the merge button.
What is the best solution as this point ?
Thanks, Frank
