When I select a conflicted file and Launch an external merge tool, there is a window that appears very briefly. I rightclick on my file and select Resolve Conflicts / Launch external merge tool. I am running OS X.10, Xcode 7 and SourceTree 2. I merged a feature branch in master and have a merge conflict. Iām using github for a large project with multiple developers ā there have been a few wrinkles using the github mac client so we switched to SourceTree ā a free github client. Kdiff3 For Sourcetree Kdiff3 Sourcetree Mac.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |