Merging two branches with Xcode
<p>I am trying to merge two branches to gather in Xcode but can not seem to do it. 
The steps I take are the following.
SourceControl > Merge from branch > pick the branch I want to get the new code from > then hit merge.</p>

<p>What popup is a warning that states this:</p>

<pre><code>The operation could not be performed because of one or more tree conflicts.
The files MyClient.xcscheme, xcschememanagement.plist, UserInterfaceState.xcuserstate, Pods-MyClient.xcscheme, SwiftyJSON.xcscheme, and xcschememanagement.plist had a tree conflict.
</code></pre>

<p>I am lost on what to do here. Thank you for any help</p>