Manual merge is not working

Hello, 

I have this pull request: https://bitbucket.org/AxiomaX/nopcommerce.languagepack.latinamerican/pull-request/1/merging-back/diff

Bitbucket tells me:

Bitbucket cannot automatically merge this request due to conflicts.
You can then either decline the request or merge it manually on your local system using the following commands:
$ git checkout master 
 $ git remote add AxiomaX/frutafresca.nopcommerce.languagepack.latinamerican https://gabrielporras@bitbucket.org/AxiomaX/frutafresca.nopcommerce.languagepack.latinamerican.git 
 $ git fetch AxiomaX/frutafresca.nopcommerce.languagepack.latinamerican 
 $ git merge --no-ff -m 'Merged in AxiomaX/frutafresca.nopcommerce.languagepack.latinamerican (pull request #1)' remotes/origin/master

I did the commands locally and the Pull Request still appears active. What more can I do?

Thanks


1 answer

1 accepted

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

1,764 views 1 5
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you