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

Resolve conflicts through source tree client in bit bucket

verma mukesh Jun 26, 2016
 

3 answers

1 vote
Seth Jun 27, 2016

You need to have some sort of merge software installed. I use Windows, so I don't know what tools are good for Mac.

In SourceTree, right-click the file, choose "Resolve Conflicts > Launch External Merge Tool".

If you haven't resolved conflicts before, you may need to research tutorials for resolving conflicts using whatever tool you choose.

0 votes
Seth Jun 27, 2016

What's your question about resolving conflicts?

0 votes
verma mukesh Jun 27, 2016

me and my friend worked on  same branch and did changes on same storyboard file, so while merging conflicts occurred.

 

So how to solve it with source tree client and also using xcode editor.

 

Thank you in advance

Suggest an answer

Log in or Sign up to answer
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

457 views 0 9
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