The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Resolve Conflicts

Dennis Mallette
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
April 20, 2021

I am new to Sourcetree and I have blown up my cope twice with it. I am having trouble with Conflicts. So I am reading and watching videos on how to use Sourcetree with GitHub. The instruction suggest I go to Actions/Resolve Conflicts.... but my menu is greyed out so I don't have any options to choose from. Is there something I am doing wrong?

It seems no mater what buttons I press, Sourcetree wants to delete all my code.

The conflicts are minor and can be easily fixed if I can just figure out what Sourcetree wants from me.

0 answers

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

TAGS
AUG Leaders

Atlassian Community Events