I’m trying to rebase the main branch of a project onto a feature branch to prepare it for merging later on when I send a pull request.
As expected its pointing out that there’s merge conflicts however in the git changes window it isn’t showing me any files that have conflicts?
I’ve tried aborting and retrying the rebase multiple times but it keeps stopping and I have no idea why.
Rebasing from the command line works but its unbelievably slow to go through every commit and fix the conflicts compared to visual studio.
Its not even giving me an option to skip, clicking continue does nothing.
What am I doing wrong here?