How to commit git merge changes to multiple files in one go in Visual Studio Team Explorer?
I am merging git branches between two branches using Visual Studio Team Explorer for git repo. I made the decision to change "Save Target". I have 190 code files. Currently it seems that I need to go through each file and click on "Save Tag". See screenshot below:
Any ideas how I can do this in batch? Any script I can run to do all of these files?
source to share
Unmerge the merge in Visual Studio Team Explorer and use the Git command line.
Assuming you are on a branch master-wg
, do:
git merge -X ours develop-wg
The parameter -X ours
causes merge conflicts to be automatically resolved, preferring "our" version (ie from the branch we are currently checking in to the branch we are merging into). Changes in another branch that do not conflict with our branch will also be reflected in the merge.
source to share