Conflict on bitbucket remote server but everything is up to date locally

You need to update your local master branch. Do the following steps:

• git checkout master
• git pull origin master
• git checkout << your branch >>
• git merge master

After you execute the 4th command, you will get merge conflicts. Resolve them and then do:

• git commit