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.
Atlassian Summit is an excellent opportunity for in-person support, training, and networking.Learn more
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
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!
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