The local repository is out of date. Make sure all changes have been pulled from the remote repository and try again

Question

I am new to Git and I am trying to merge my branch (With_Base_Class) with the remote master branch from within Xcode.

I tried commiting and pulling in every possible order (I hope), but every time I recieve the following error:

The local repository is out of date. 
Make sure all changes have been pulled from the remote repository and try again.

This is a video of me getting the error:

https://youtu.be/sEfSnnHONkU

What am I doing wrong?

Any help is appreciated.

Thanks!

Answer 1

Try this git command

git push origin master --force

Answer 2

Thanks to KinneyKare's answer, I tried simply shutting down and restarting Xcode. This worked! If you get the

The local repository is out of date.

error in Xcode, I suggest first trying to simply exiting/shutting down/and restarting Xcode. (aka: throw the big red switch if all else fails).