There is file A on master. The release of other branches adds file B to master. I deleted file A on the dev branch. Will A be merged every time the dev branch pulls changes to master? Then I will Wouldn’t it be necessary to delete file A again every time? If a lot of files are deleted during reconstruction, it will be very troublesome.
I executed git merge master under the dev branch
Please tell me, if I merge file A with the trunk for the first time, and then git rm A, if I merge with master again in the future, A will not be merged again?
为情所困2017-05-02 09:29:41
No, unless someone modifies file A in another branch, then your merge will cause a merge conflict, requiring you to handle it manually.
