FIX: VSCode merge conflict options not displaying on conflict files

Tilak poudel
Sep 2, 2022

Welcome readers, I hope you are here because you also missed the options to resolve to merge conflict in VSCode.

So before moving on to the solution let me make you know about the cause of the disappearance of the options.

Cause:

The work on a feature named 3 way merge editor seems to cause the merge conflict options to disappear, but the feature exists with an improvised view.

Solution:

Those, who want to get the conflicts resolution options that appear on the conflict file can follow the following steps:

  • In VSCode, Got to setting(ctrl+,).
  • Search git.mergeEditor
  • Git:Merge Editor make it FALSE i.e uncheck the checkbox.

Thanks for reading.

Don’t forget to mention in a comment if it worked for you. :)

See you in the next post :) Till then BYe, Take care.

Happy Coding…..

--

--