How to git rebase and use ours as strategy using VSCode without using the terminal. I tried everything but couldn't find it with or without using extensions.
Asked
Active
Viewed 148 times
1 Answers
1
As I mentioned, in case of conflict, accepting the changes in HEAD would be using a "ours" strategy.
But if there is no conflict, and you need to keep the ours strategy by default, then you need a merge driver in place, declared in a .gitattributes.
Once this configuration is done, any rebase would use the equivalent of a ours strategy, and no terminal would be needed.
You would need to change the .gitattributes afterward though, of that "ours" strategy would be permanent.
VonC
- 1,262,500
- 529
- 4,410
- 5,250
-
But how can you do this automatically for all conflicting commits in vscode – user3507230 Jul 14 '20 at 21:43
-
That would be where the merge driver, declared in the gitattributes file, would help. – VonC Jul 14 '20 at 22:05