Here is my scenario: I have a feature branch that has a pull request with the target being the develop branch. There is a merge conflict in the feature branch, and I get a warning on the pull request that says I must manually resolve the conflict.
I follow the steps as outlined: I check out develop locally and update it. I then check out my feature branch and merge develop into it, resolving any conflicts. I then push my feature branch to the repository. This action should update the pull request to show that the merge conflicts have been resolved, but nothing changes and I cannot merge the pull request.
So, I decide to locally merge my feature branch into develop. When I do this I merge the feature branch into develop and push develop to the remote. Again, I expect the open pull request to update in some way, but nothing happens. I'm stuck with an open pull request that I can do nothing with.
This type of problem has happened to me 3 times in the last several days. Once as described above with merge conflicts, and twice with just having the develop branch be ahead of the feature branch (I hadn't pulled the latest to the develop branch and locally merged that into my feature branches. Same result, though, in that I had a pull request that would not allow me to merge and pushing merged code wouldn't update the pull request).
This feels like a bug, or configuration issue.
I found this support item, and am wondering if this may be part of my problem: https://confluence.atlassian.com/stashkb/pull-requests-not-reflecting-changes-pushed-to-remote-branch-after-an-upgrade-385321658.html
Anyone else seeing this, or know how to resolve this?
Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster ! While we’re all excited about the new improvements to Bitbucket ...
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