0

VS Code is now asking me to resolve conflicts in merge editor when I am opening some files. I want to use the old inline view where I can see the changes in a simple vertical style and choose what to accept or reject. However instead of showing me that it is not showing the errors and instead showing me this, which takes me to a 3 merge editor.

enter image description here

I do not want this and have turned it off in the settings as shown here git merge conflict window off

However it is still showing me this and not giving me the old window. However for some files the old window will work for some reason. I want all my files on the old inline window with my accect incoming or accept current buttons. Can anyone help?

rioV8
  • 24,506
  • 3
  • 32
  • 49
nightwolf555
  • 327
  • 1
  • 14
  • Does this answer your question? [How to change VS Code's merge conflict layout?](https://stackoverflow.com/questions/73277690/how-to-change-vs-codes-merge-conflict-layout) – starball May 23 '23 at 23:04
  • no because I have already followed the advice in that thread by unchecking git merge editor as highlighted in my second image – nightwolf555 May 24 '23 at 01:01
  • https://meta.stackoverflow.com/a/285557/11107541 and https://code.visualstudio.com/docs/getstarted/settings#_settingsjson – starball May 24 '23 at 01:07
  • @user theres no code to paste in this context its a ide question – nightwolf555 May 24 '23 at 04:55
  • what does that three way merge editor look like? Can you show a screenshot of it? – starball Jun 20 '23 at 00:23

0 Answers0