Branch conflicts error, but git status is up to date

Hi,

Wondering what other people have done when there are no conflicts to resolve (git status is up to date, branches are even, I’m the only one pushing to the branch, and I did a ‘git pull’ just to make sure) but I still get the error " This branch cannot be rebased due to conflicts".

The ‘Resolve conflicts’ button is deactivated, as well, so I can’t go that route. Any ideas?