Visual Studio Code how to resolve merge conflicts with git?

GitVisual StudioMergeVisual Studio-Code

Git Problem Overview

I tried to merge my branch with another branch and there was a merge conflict. 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 tried googling it but I can't find out why it won't let me commit my changes, all of the conflicts have disappeared.

Git Solutions

Solution 1 - Git

With VSCode you can find the merge conflicts easily with the following UI. enter image description here

(if you do not have the topbar, set "editor.codeLens": true in User Preferences)

It indicates the current change that you have and incoming change from the server. This makes it easy to resolve the conflicts - just press the buttons above <<<< HEAD.

If you have multiple changes and want to apply all of them at once - open command palette (View -> Command Palette) and start typing merge - multiple options will appear including Merge Conflict: Accept Incoming, etc.

Solution 2 - Git

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

Solution 3 - Git

For those who are having a hard time finding the "merge buttons".

The little lightbulb icon with the merge options only shows up if you click precisely on the "merge conflict marker":

<<<<<<<

Steps (in VS Code 1.29.x):

Solution 4 - Git

  1. Click "Source Control" button on left.
  2. See MERGE CHANGES in sidebar.
  3. Those files have merge conflicts.

VS Code > Source Control > Merge Changes (Example)

Solution 5 - Git

The error message you are getting is a result of Git still thinking that you have not resolved the merge conflicts. In fact, you already have, but you need to tell Git that you have done this by adding the resolved files to the index.

This has the side effect that you could actually just add the files without resolving the conflicts, and Git would still think that you have. So you should be diligent in making sure that you have really resolved the conflicts. You could even run the build and test the code before you commit.

Solution 6 - Git

For VS Code 1.38 or if you could not find any "lightbulb" button. Pay close attention to the greyed out text above the conflicts; there is a list of actions you can take.

Categories
Recommended Git Solutions
Recommended Visual Studio Solutions
Recommended Merge Solutions
Recommended Visual Studio-Code Solutions

Previous Solution:

What is difference between arm64 and armhf?

LinuxArmDebianArm64

Next Solution:

Django model "doesn't declare an explicit app_label"

PythonDjangoPython 3.x

Attributions

All content for this solution is sourced from the original question on Stackoverflow.

The content on this page is licensed under the Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) license.

Content TypeOriginal AuthorOriginal Content on Stackoverflow
QuestionannedroiidView Question on Stackoverflow
Solution 1 - GitSajeetharanView Answer on Stackoverflow
Solution 2 - GitannedroiidView Answer on Stackoverflow
Solution 3 - GitB12ToasterView Answer on Stackoverflow
Solution 4 - GitGeoffrey HaleView Answer on Stackoverflow
Solution 5 - GitTim BiegeleisenView Answer on Stackoverflow
Solution 6 - GitQiang LiView Answer on Stackoverflow