How to merge conflicts in Visual Studio Code

Question

My team is using Visual Studio Code and TFSVC. When we have a conflict, Visual Studio seems to give two options: Keep Yours or Take Theirs. There doesn't seem to be an option to actually merge the code together, manually. I need to keep my method while also bringing in my teammates method. How do you do this in Visual Studio Code?

Answer 1

Unfortunately this is not supported by the version control extension that you are using. According to the official docs, the only "resolve" commands they support are the two that you have already found:

• Resolve: Take Theirs – Resolves the conflict as Take Theirs.
• Resolve: Keep Yours – Resolves the conflict as Keep Yours.

You can open a feature request here.