Prevent merging a file from master with Git

后端 未结 2 1098
执念已碎
执念已碎 2021-01-01 04:17

In another question it is recommended to use .gitattributes in order to keep the file tracked but not merged in different branch, but my use case below seems no

2条回答
  •  不知归路
    2021-01-01 04:38

    I suspect that it did not work because there were no merge conflicts.

    However, I can confirm that git merge master --strategy=ours works as expected.

    This might be what you're looking for: How to tell Git to always select my local version

    If you want to specify a specific merge strategy for a specific file, what you really need to do is to write a custom merge driver and specify in your repository configuration that you want that merge driver to be used as the default. See the link above on how to use it.

    In short, the reason it does not work in your use case is because your use case is not a merge. It only portrays a bunch of changes on master with a temporary branch called test being created and then moved up to master later on. You never actually introduce a commit while you're on the test branch.

提交回复
热议问题