2

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.

What popup is a warning that states this:

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.

I am lost on what to do here. Thank you for any help

robstarbuck
  • 6,893
  • 2
  • 41
  • 40
MNM
  • 2,673
  • 6
  • 38
  • 73

1 Answers1

2

The usual advice is to fall back to the CLI (command-line), and do a git status

From there, you can resolve any conflict mentioned (like here), git add, and if a merge was indeed in progress, git commit to complete it.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250