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

Question

I'm working on a project, so I pushed a feature branch to the remote repository(using Atlassian bitbucket) and opened a pull request.

But on one file, the bitbucket diplay a "MOVED" status, in brown and shows a conflict message :

conflict: modified on source, modified in target.

this file is in a conflicted state. You will need to resolve the conflict manually before you can merge this pull request.

So when I typed:

git pull origin my_feature

I get the message

Already up-to-date.

How can I resolve this conflict?

Answer 1

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