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.
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...
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