Ce site est optimisé pour être consulté depuis un navigateur moderne dans lequel JavaScript est activé.

Visual Studio Code how to resolve merge conflicts with git?

<t>Visual Studio Code how to resolve merge conflicts with git?</t>

<t>After trial and error I discovered that you need to stage the file that had the merge conflict, then you can commit the merge.</t>