So I have a rather unusual case. The branch I want to rebase on has some submodules that have been changed. In my branch however those submodules have been deleted.
I assume that fork does something along the lines of "git add old/path" when I right click on the unstaged things and use "resolve using develop" but rather should use "git rm --cached -- old/path" or similar for it.
Using the checkbox on the righ view and then chosing "delete" file button works fine.
So I have a rather unusual case. The branch I want to rebase on has some submodules that have been changed. In my branch however those submodules have been deleted.
I assume that fork does something along the lines of "git add old/path" when I right click on the unstaged things and use "resolve using develop" but rather should use "git rm --cached -- old/path" or similar for it.
Using the checkbox on the righ view and then chosing "delete" file button works fine.