frameo下载

Searching…

stackoverflow.com

Visual Studio Code how to resolve merge conflicts with git?

In Visual Studio Code (version 1.2.1) I resolved all of the issues, however when I try to commit it keeps giving me this message: You should first resolve the un-merged changes before committing your changes. I've tri...