0

Out of sudden I noticed the git options not working in my visual code editor. All I see are the plain text, they used to be segment in different background color and also links where I can click to accept incoming/remain current changes etc..

Current problem is showing this enter image description here

Should be like this enter image description here

torek
  • 448,244
  • 59
  • 642
  • 775
4 Leave Cover
  • 1,248
  • 12
  • 40
  • 83
  • what do you mean by git options? – Chandan Aug 25 '22 at 07:21
  • hi, I have updated my question with reference. Im not exactly sure what are they called, Im referring to the "Accept Current Change | Accept Incoming Change | ..." – 4 Leave Cover Aug 25 '22 at 07:59
  • 1
    Does this answer your question? [Accept Incoming Change not appearing in VS Code](https://stackoverflow.com/questions/47241098/accept-incoming-change-not-appearing-in-vs-code) – kaffarell Aug 25 '22 at 08:10

1 Answers1

0

In VS code there is another way to merge code conflicts which you can find

Settings -> Git Merge (under user tab).

just uncheck that and then it will show you Merge options on your page like you are looking for.

VS Code Settings

Hope this helps.

Chandan
  • 217
  • 1
  • 3
  • 17