相关疑难解决方法(0)

我有一个iPad应用程序(XCode 5,iOS 7,Git源代码控制和故事板).我目前有两(2)个分支机构(App Store中为1.8.1,工作副本为2.0.0).

我在下一个版本中略微改为1.8.1,并认为XCode的源代码控制会自动将更改合并到2.0.0.我想我错了.所以我尝试使用XCode的源代码控制来进行合并,这就是事情发生了变化......它进入了一个循环.所以,我杀死了XCode,并重新启动它.

现在,我正在尝试使用SourceTree进行合并.它告诉我我的工作副本中存在合并冲突,即(2.0.0).看一下2.0.0的版本,我看到了这个:

      <BreakpointProxy
     BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
     <BreakpointContent
        shouldBeEnabled = "No"
        ignoreCount = "0"
        continueAfterRunningActions = "No"
        filePath = "saori/CalendarViewController.m"
        timestampString = "404851038.443273"
<<<<<<< HEAD                              <---------------- merge conflict
        startingColumnNumber = "9223372036854775807"
        endingColumnNumber = "9223372036854775807"
        startingLineNumber = "205"
        endingLineNumber = "205"
        landmarkName = "-viewDidLoad"
=======
        startingColumnNumber = "9223372036854775807"
        endingColumnNumber = "9223372036854775807"
        startingLineNumber = "205"
        endingLineNumber = "205"
        landmarkName = "-viewDidLoad"
        landmarkType = "5">
     </BreakpointContent>
  </BreakpointProxy>
  <BreakpointProxy
     BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
     <BreakpointContent …