0

When I use VSCode all is good till I try to diff a conflict in a rebase. In IJ I would just right click > git > show conflicts.

I can't find a equivalent VSCode extension, can someone point me in the correct direction? How do I show rebase conflicts in VsCode?

Jackie
  • 21,969
  • 32
  • 147
  • 289
  • 2
    Does this help you - https://learn.microsoft.com/en-us/visualstudio/version-control/git-resolve-conflicts?view=vs-2022 – Vini Nov 28 '22 at 03:47
  • open the file that has the conflict and the conflict resolve mode is enabled – rioV8 Nov 28 '22 at 04:04
  • 1
    @Vini lots to digest there apparently no just a right click sub menu :-P. I will look into it tomorrow and confirm that will work some of the screenshots look promising like https://learn.microsoft.com/en-us/visualstudio/version-control/media/vs-2022/git-conflicts-vertical-view.png?view=vs-2022 – Jackie Nov 28 '22 at 04:22
  • Also I like to use the terminal for most things so I only switch once the conflict lines are created – Jackie Nov 28 '22 at 04:25
  • Please check this link if this helps [resolve merge conflicts with git in VS code](https://stackoverflow.com/questions/38216541/visual-studio-code-how-to-resolve-merge-conflicts-with-git) – user8811698 Nov 28 '22 at 04:44

0 Answers0