I am trying to merge branch-to-safely-merge-pav-origin
with pj-master
the directory structure of the branch pj-master
:
the directory structure of the branch branch-to-safely-merge-pav-origin
:
After the merge the content of the pj-master
is being replaced (not merged) by the contents of the branch-to-safely-merge-pav-origin
. No attempt to merge, no conflicts (andfor sure there are conflicts). Any clues?
My guess is that the files were present in pj-master~
and they were deleted in one of the revisions that takes you to branch-to-safely-merge-pav-origin
. So.... the trick is to understand what was at the last revision present on both branches ( pj-master~
). Looking at the tips of the 2 branches is just not enough.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.