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

Opps... Thanks!

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Nov 06, 2018 in Bitbucket

Upgrade Best Practices

Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...

440 views 6 9
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