git merge 替换一个分支而不实际合并它们
[英]git merge replaces one branch without actually merging them
问题描述
I am trying to merge branch-to-safely-merge-pav-origin with pj-master
我正在尝试将branch-to-safely-merge-pav-origin与pj-master branch-to-safely-merge-pav-origin
the directory structure of the branch pj-master :分支pj-master的目录结构：
the directory structure of the branch branch-to-safely-merge-pav-origin :分支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 .合并后， pj-master的内容被branch-to-safely-merge-pav-origin的内容替换（未合并）。 No attempt to merge, no conflicts (andfor sure there are conflicts).没有尝试合并，没有冲突（并且肯定有冲突）。 Any clues?有什么线索吗？
1 个解决方案
解决方案1
1 已采纳 2020-01-31 19:43:16
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 .我的猜测是这些文件存在于pj-master~并且在将您带到branch-to-safely-merge-pav-origin的修订之一中删除了它们。 So.... the trick is to understand what was at the last revision present on both branches ( pj-master~ ).所以......诀窍是了解两个分支（ pj-master~ ）上存在的最后一个修订版中的内容。 Looking at the tips of the 2 branches is just not enough.仅查看 2 个分支的提示是不够的。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.