Manual merge is not working

[Gabriel Porras]

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

[Seth · Accepted solution]

https://answers.atlassian.com/questions/148518

[Gabriel Porras]

Opps... Thanks!