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

git conflict bitbucket-server
NI6 picture NI6 · Sep 26, 2016 · Viewed 20k times · Source

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

Lets Code picture Lets Code · Jun 29, 2017

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

Related questions

Git resolve conflict using --ours/--theirs for all files

Is there a way to resolve conflict for all files using checkout --ours and --theirs? I know that you can do it for individual files but couldn't find a way to do it for all.

Read More
Eclipse EGit Checkout conflict with files: - EGit doesn't want to continue

I've started Eclipse EGit. In some scenarios it is really not comprehensive. I have local file e.g. pom.xml changed. On git server this file was changed. I do pull, EGIt says: Checkout conflict with files: i.e. pulling …

Read More
How do I manage conflicts with git submodules?

I have a git superproject that references several submodules and I am trying to lock down a workflow for the rest of the my project members to work within. For this question, lets say my superproject is called supery and …

Read More