Visual Studio Code Merge Conflict UI not showing

Question

I have a merge conflict with VS Code that I'm trying to resolve. My current screen doesn't seem to show options for 'accepting current change', 'accepting incoming change' etc.

I'm expecting the UI to be like this:

Any help is appreciated!

Answer 1

MANUAL FIX:

I remember you , vs code is a text editor , so you can take and delete , change everything you see even when you see UI for merge .

At this point pay attention to what you choose and delete the rest, or if you both need to copy what you find inside the head below and then delete the head, then continue with git , commit , pull , push and you should resolve the merge .

I remind you to delete the cmets ( I’ll leave you some notes on the merge cmets ), which will otherwise cause problems in the code :

<<<<<<<< < Head : indicates the code in head already present in the repository
========== : indicates the beginning of the one with which you would replace the head 
>>>>>>>>fd6.... : indicates the end of what to replace the head with 

UI FIX :

Make sure that you have the latest version of Visual Studio Code installed. The merge conflict UI is a built-in feature of Visual Studio Code, so updating to the latest version might resolve the issue.

Check the settings for the Git extension. In Visual Studio Code, go to File > Preferences > Settings and search for "Git: Merge Tool". Make sure that the setting is set to "visual studio code" or "code", depending on your version of Visual Studio Code.

Check your Git configuration. Run the following command in a terminal to see if you have a merge tool configured:

git config --global --get merge.tool

If the output is not "visual studio code" or "code", you can set it by running the following command:

git config --global merge.tool code

If the issue persists, try resetting the Git extension settings. In Visual Studio Code, go to File > Preferences > Settings, click the "Edit in settings.json" button, and add the following line:

"git.enableSmartCommit": false

Save the file and restart Visual Studio Code. Then, try enabling the smart commit feature again by going to File > Preferences > Settings and setting "git.enableSmartCommit" to "true".