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://firstname.lastname@example.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?
This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.Read more
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 ...
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