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

Atlassian Community Events