Cannot merge conflicts for an approved pull request Edited

My pull request containing conflicts was approved. When I click on "More Information" after the conflict warning, the following dialog pops up:

 This pull request has conflicts. You must resolve the conflicts before you can merge:

Step 1: Fetch the changes (saving the source branch as FETCH_HEAD).

git fetch origin Feature1

Step 2: Checkout the target branch and merge in the changes from the source branch. Resolve conflicts.

git checkout uat
git merge FETCH_HEAD Step 3: After the merge conflicts are resolved, stage the changes accordingly, commit the changes and push. git commit
git push origin HEAD Step 4: The pull request will be updated and marked as merged.

I have done all steps, but the last one in #3. When I push, I get the following error:

remote: Branch refs/heads/uat can only be modified through pull requests.

remote: Check your branch permissions configuration with the project administrator. 

What is the correct command to complete the pull request merge?

0 answers

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

23,000 views 26 12
Join discussion

Atlassian User Groups

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!

Find my local user group

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

Groups near you