<div>
<div class="content wysiwyg-content">
I use SourceTree for my Objective-C and Xcode coding project. &nbsp;It's worked great thus far. &nbsp;But now when we try and merge code, we are have a crisis. &nbsp;SourceTree only seems to allow the use of an external merge tool. &nbsp;But does not seem to have one.<br />
<br />
What can anyone suggest I do? &nbsp;I am completely stuck.<br />
<br />
Thank you for the help.
</div>
</div>


I use SourceTree for my Objective-C and Xcode coding project.  It's worked great thus far.  But now when we try and merge code, we are have a crisis.  SourceTree only seems to allow the use of an external merge tool.  But does not seem to have one.

What can anyone suggest I do?  I am completely stuck.

Thank you for the help.

Xcode: Need a Merge Tool for SourceTree

Mac OS X is the desktop operating system from Apple Inc., found on Macintosh computers. OS X consists of a Mach/BSD-based kernel, operating system interfaces primarily based on FreeBSD and additional frameworks (written in C, C++ and Objective-C providing user interface and application-level services.

Mac OS X

Project management software has the capacity to help plan, organize, and manage resource tools and develop resource estimates. Depending on the sophistication of the software, it can manage estimation and planning, scheduling, cost control and budget management, resource allocation, collaboration software, communication, decision-making, quality management and documentation or administration systems.

Project Management Software

Swift is a compiled programming language created for iOS, OS X, watchOS, tvOS and Linux development by Apple Inc. Swift is designed to work with Apple's Cocoa and Cocoa Touch frameworks and the large body of existing Objective-C code written for Apple products. Swift is intended to be more resilient to erroneous code ("safer") than Objective-C and also more concise. It is built with the LLVM compiler framework included in Xcode 6 and later and uses the Objective-C runtime, which allows C, Objective-C, C++ and Swift code to run within a single program. A second free implementation of Swift targets Microsoft's Common Language Infrastructure (a.k.a. .NET) and the Java/Android platform.

Swift Programming

Objective-C is an object-oriented programming language that is a strict superset of C (any valid C code is equally valid Objective-C code), and it inherits its object-oriented capabilities from Smalltalk. All procedural syntax is identical to that of C, and all object-oriented syntax is an implementation of Smalltalk messaging. It is the main programming language used by Apple for OS-X and iOS and their respective APIs/ Objective-C inherits the syntax, primitive types, and flow control statements of C and adds syntax for defining classes and methods.