如何在Visual Studio团队资源管理器中一次性接受多个文件中的Git分支合并更改？

Question

I am doing a git branch merge between two branches using Visual Studio Team Explorer for a Git Repo. I have made a decision to 'Keep Target' changes. I have 190 code files to do. At present, it appears I have to go through each file and click 'Keep Taget'. Please see the screen shot below:

Any ideas how I can do this in a batch? Any script that I can run to do all these files?

Answer 1

Undo the merge in Visual Studio Team Explorer and use the Git command line.

Assuming you're on the master-wg branch, do:

git merge -X ours develop-wg

The -X ours option forces merge conflicts to be auto-resolved by favouring 'our' version (ie from the branch we're currently checked out on, the branch we're merging into). Changes from the other branch that do not conflict with our branch will also be reflected in the merge result.