Resolve conflicts through source tree client in bit bucket

[Seth]

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.

[vermamukesh67]

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

[Seth]

What's your question about resolving conflicts?