CODEWITHSUNDEEP
githubmerge-conflict-resolutiongit-merge-conflictgithub-desktop
Ricardo Dias
Ricardo Dias

Reputation: 21

Github Desktop not displaying merge conflicts interface

I've always used github desktop for viewing my merge conflicts and also solving them, but recently that beautiful and bright interface has suddenly disappeared and I just can't find a way to get it back and see my conflicts side by side.

I've already tried pretty much everything, and nothing seems to work.

Any thoughts?

Upvotes: 2

Views: 759

Answers (1)

Azurespot
Azurespot

Reputation: 3152

Not sure if you see the merge conflict in your PR on GitHub or not, but for me, I could see it there, but not in GitHub Desktop or in Visual Studio Code (VSC).

I then went to Branch > Update from main and now I see a notification in GitHub Desktop that asks me to resolve conflicts. This also updated my VSC, so I see the conflicts there too.

Upvotes: 0

Related Questions