I was attempting to merge a pull request from a feature branch into my develop branch. The merge failed with the error: Bitbucket cannot automatically merge this request due to conflicts.
The develop branch had some changes that were not merged into my feature branch, which caused this error to happen.
I went to my local repository, and pulled the changes from the develop branch, and then merged the updated develop branch into my feature branch. I then pushed my feature branch out to the repository. This action didn't change anything with the pull request, and I was still unable to merge (same error message, even though the feature was fully caught up with develop).
Then, reading the help message better, I determined I needed to merge my feature into the develop branch on my local repository. I did this, and pushed the develop branch out. I expected the pull request to update as being merged, but there was no change. The only thing I could figure to do was to delete the pull request, since it was technically already merged. I don't want to have to delete pull requests, I would like to maintain a history of them.
My question is, where did I go wrong? I must have missed something, because I would have expected the pull request to update after both actions (merging updated develop into feature branch, or merging feature into updated develop).
Hey everyone, over the past year, we've added several new features on how you can use Bitbucket and Jira together. We'd love to know how you'll are using the integration and how it's helping your t...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events