Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root


1 badge earned


Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!


Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.


Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!


Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
Community Members
Community Events
Community Groups

Resolve Conflicts

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

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events