It's not the same without you
Join the community to find out what other Atlassian users are discussing, debating and creating.
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.
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
This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.
Read moreSupported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!
Find a groupConnect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.
Start an AUGYou're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.