It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

0 votes
Answer accepted

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

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Next-gen

Keyboard shortcuts have arrived for next-gen projects!

...ollected feedback from users around the lack of shortcuts, and we’re here to address that: In next-gen projects, I miss the keyboard shortcuts badly. This is particularly true on the Board, but also i...

102 views 0 1
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you