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
hg merge 5be0318f2bdc
hg commit -m 'Merged in rwritz/guac (pull request #1)'

But after entering step two I get:

http authorization required for
realm: HTTP

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

Accepted Answer
0 votes

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

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted Tuesday in Featured Groups

Tuesday tips & tricks: What is the Atlassian Community?

It's officially Tuesday, which means it's officially time for another tip to help you better navigate this space we call the Atlassian Community. 😄 I got a great question from community member, Sa...

100 views 3 7
View post

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