How can I resolve GIT conflicts in Webmatrix 3?

Question

I'm using Webmatrix3 and GIT on a project with another developer. Now we have a conflict on a file. I've resolved it, but I can't find a command in Webmatrix GUI to let GIT accept my resolved version of the file.

Answer 1

Resolving a conflict means:

• modifying a file
• add, commit (local)
• push to remote

That means (from "How to use Git in WebMatrix"):

• once you have resolved the conflict, you need to add and commit with Webmatrix3:

• Then push: