84669 person learning
152542 person learning
20005 person learning
5487 person learning
7821 person learning
359900 person learning
3350 person learning
180660 person learning
48569 person learning
18603 person learning
40936 person learning
1549 person learning
1183 person learning
32909 person learning
master上有A文件,其他分支的发布增加了B文件到master,我在dev分支上删除了A文件.那dev分支每次pull master的修改,是否都会把A合并下来..那我岂不是每次都得重新删除一遍A文件?如果重构的时候删除文件很多的话,会很麻烦.
我是在dev分支下执行的git merge master
请指教下,是否我第一次跟主干merge下来A文件,然后git rm A后,以后如果再跟master合并的话,就不会再把A给合并下来了?
认证0级讲师
No, just use rebase if you are not worried, it definitely won’t
No, unless someone modifies file A in another branch, then your merge will cause a merge conflict, requiring you to handle it manually.
No,
just use rebase if you are not worried, it definitely won’t
No, unless someone modifies file A in another branch, then your merge will cause a merge conflict, requiring you to handle it manually.