Visual Studio Code how to resolve merge conflicts with git

Question

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

User · Answer

Click  Source Control  button on left  See MERGE CHANGES in sidebar  Those files have merge conflicts

User · Answer

For those who are having a hard time finding the  merge buttons    The little lightbulp icon with merge options only shows up if you click precisely on the  merge conflict marker     lt  lt  lt  lt  lt  lt  lt    Steps  in VS Code 1 29 x

User · Answer

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

User · Answer

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

User · Answer

With VSCode you can find the merge conflicts easily with the following UI      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  lt  lt  lt  lt  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

User · Answer

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

[git] Visual Studio Code how to resolve merge conflicts with git?

Examples related to git

Examples related to visual-studio

Examples related to merge

Examples related to visual-studio-code