Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
badges earned

Your Points Tracker
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Manually fixing merge conflicts locally and pushing does not update pull request status

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:


Anyone else seeing this, or know how to resolve this?



Log in or Sign up to comment
Community showcase
Published in Bitbucket

New improvements to user management in Bitbucket Cloud 👥

Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...

543 views 4 13
Read article

Community Events

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

Events near you