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

0 votes
Accepted answer

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

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted 9 hours ago in Canada

Happy New Year - First AUG of the year - great success

Hi Everyone, Hope everyone had a great holiday season and is ready for an exciting 2019.  We had our first AUG last night featuring Tempo Timesheets.  A great presentation and lots of int...

12 views 0 1
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