Error message: "Merge failed: Rebase failed. Please rebase locally. Please try again."
Trying to merge. Branch to master, both showing in the console via "git status" as up to date.
Can you explain why this message appears and how to solve it? Pushing to master is prohibited by the organisation I work for so supplied instructions don't work.