Merge pull request conflicts

I am trying to pull a "pull request" from another users fork of my project. It states there is a conflict and I need to handle it manually by pulling into my local repo. It provides the following intructions:

hg update default
hg pull -r default https://bitbucket.org/rwritz/guac
hg merge 5be0318f2bdc
hg commit -m 'Merged in rwritz/guac (pull request #1)'

But after entering step two I get:

http authorization required for https://bitbucket.org/rwritz/guac
realm: Bitbucket.org HTTP
user:

After entering my username and password it results in:

abort: authorization failed

What am i doing wrong? I can push and pull to the repo normally from my local repo, but cannot pull from the fork contribution.

1 answer

1 accepted

Solved: The problem was the contributer needed to grant me access.

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 Thursday in Off-topic

Friday Fun: Magic Eyes

...staring into the background. Once the image pops out in 3D, you can look around the picture and enjoy. If you will see if you are a true illusion master! :) You did it? :) Wow! Awesome! As a bonus...

415 views 79 11
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