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

 

3 answers

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.

What's your question about resolving conflicts?

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
Posted Jan 17, 2019 in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

1,351 views 13 14
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you