Git merge strategy to ignore deleted files

后端 未结 4 1297
悲&欢浪女
悲&欢浪女 2020-12-30 00:45

I have special branch (release branch) which is an exact copy of master branch with some files and directories removed. No development is happening on this branch, however i

4条回答
  •  青春惊慌失措
    2020-12-30 01:40

    By having a look at this question, it looks like the recursive strategy with ours or their option doesn't consider a deletion as a conflict.

    What you can do though is use this feature to specify a specific strategy for some files. I would bet that the ours strategy (not option) would do the trick for those files.

    EDIT:

    As stated in the comment, you can't do this !

    You should definitly contact Git mailing list if this is a very important feature to you (git@vger.kernel.org)

提交回复
热议问题