That is an error from git when I try to rebase a repository to a master.
I’m not sure what rebasing does, I’m just trying to get around this:
error: Entry ‘…’ not uptodate. Cannot merge.
Any ideas? I’m currently having to delete everything and then run git pull.