visual studio – git is showing Unmerged paths: both modified – I don’t know what I did


I have a visual studio project which uses git. I don’t normally use VS for my work – this is a side project – I normally work from the command line and I’m a git novice anyway. I must’ve done something in visual studio – accidentally hit a key combo or clicked on something – I was looking at the other monitor so I didn’t see what triggered it and I only noticed when the code didn’t run. I looked in VS and now I have this appearing in my source code:

enter image description here

and when I ran git status I got four sections:

Changes to be committed:
    modified:   file_1
    modified:   file_2
Unmerged paths:
    both modified:   file_3
Changes not staged for commit:
    modified:   file_1
    modified:   file_2
Untracked files:
    file_4
    file_5
    file_6

I wasn’t intending to do anything and it’s broken my code – it won’t run. Can anyone tell what I did and how to undo it?

VS 2022 - Version 17.14.19
git version 2.47.1.windows.2

Leave a Reply

Your email address will not be published. Required fields are marked *