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://email@example.com/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?
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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