Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,458,992
Community Members
 
Community Events
176
Community Groups

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: 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?

0 comments

Comment

Log in or Sign up to comment
TAGS

Atlassian Community Events