Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

How do I get past this Merge error?

Screen Shot 2018-09-18 at 1.22.45 PM.png After committing, I tried to Finish the Feature and get the above 2 errors every time.    Where do I configure the device? 

I've looked through your forum and can't seem to find anything similar.    This is SourceTree v2.7.6 (177) on a Mac 10.11 machine.   

Thanks!

1 answer

0 votes
Manju Atlassian Team Sep 20, 2018

Are you using OAuth for GitHub? Or is this using basic authentication for the account?

Yes, OAuth for GitHub.  

It seems that if I run through the steps manually, it works, but I still can't get the Git Flow to finish it.

What can I try to get past this error?

Manju Atlassian Team Sep 26, 2018

We are aware of an issue which affects only gitflow because gitflow looks for password and we are using token here which aren't getting parsed as expected. We are working on a fix for this for an upcoming release and appreciate your patience. 

Thanks!

Thank you for the reply and for putting this into your queue.

I'll try to see if I can reconfigure my system to use a Password instead of a Token maybe.   

Do you have a process for notifying me when this is resolved?

Manju Atlassian Team Oct 11, 2018

Yes, we will have you tagged here in this same post when this gets resolved. 

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,274 views 4 5
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