Question

每当我尝试将分支合并到另一个分支时Xcode 6.0.1崩溃。

到目前为止，我有：

尝试从另一台计算机上合并相同的分支（推动它们并在显然之前将它们拉出来）并且它仍然崩溃。
从“故障分支”创建了一个新分支，在其中添加了一个空格，并将其合并回“故障分支”并成功完成。但无法将其合并到我想要的原始分支中。

Xcode有什么问题？我怎样才能合并分支机构？（大约有100个文件要合并）

编辑2

其中一个文件存在冲突，在解决Xcode合并编辑器中的冲突后，它不仅会在尝试合并时崩溃，甚至在尝试查看其他文件时也会崩溃（查看其他文件）在解决冲突之前不会崩溃。）
以这种方式编辑其中一个分支以避免合并时的冲突将保存解决冲突，但Xcode在合并时仍会崩溃

编辑 - 添加崩溃警报：

    Process:         Xcode [3146]
    Path:            /Applications/Xcode.app/Contents/MacOS/Xcode
    Identifier:      com.apple.dt.Xcode
    Version:         6.0.1 (6528)
    Build Info:      IDEFrameworks-6528000000000000~2
    App Item ID:     497799835
    App External ID: 712682811
    Code Type:       X86-64 (Native)
    Parent Process:  launchd [162]
    Responsible:     Xcode [3146]
    User ID:         501

    Date/Time:       2014-09-30 15:30:49.320 +0300
    OS Version:      Mac OS X 10.9.4 (13E28)
    Report Version:  11
    Anonymous UUID:  3A19C91F-0A10-76C9-10BB-C3B0EABB5390


    Crashed Thread:  0  Dispatch queue: com.apple.main-thread

    Exception Type:  EXC_CRASH (SIGABRT)
    Exception Codes: 0x0000000000000000, 0x0000000000000000

    Application Specific Information:
    Sending merge: to <IDESourceControlMergeWindowController: 0x7fc4d0974a90> from         <NSButton: 0x7fc4cd57e7e0>
    ProductBuildVersion: 6A317
    ASSERTION FAILURE in /SourceCache/IDEPlugins/IDEPlugins-                6244/IDEQuickLookEditor/Comparison/IDEQuickLookVersionsTwoUpSubmode.m:210
    Details:  primaryDocumentLocation should be an instance inheriting from         IDESourceControlDocumentLocation, but it is nil
    Object:   <IDEQuickLookVersionsTwoUpSubmode: 0x7fc4d0e515d0>
    Method:   -_saveMergeState
    Thread:   <NSThread: 0x7fc4c9716f00>{name = (null), num = 1}
    Hints:   
      0: Sending merge: to <IDESourceControlMergeWindowController: 0x7fc4d0974a90> from         <NSButton: 0x7fc4cd57e7e0>
    Backtrace:
      0  0x0000000106343f0a -[IDEAssertionHandler         handleFailureInMethod:object:fileName:lineNumber:assertionSignature:messageFormat:arguments:]         (in IDEKit)
      1  0x0000000105106baf _DVTAssertionHandler (in DVTFoundation)
      2  0x0000000105106e9e _DVTAssertionFailureHandler (in DVTFoundation)
      3  0x00000001150b4cee -[IDEQuickLookVersionsTwoUpSubmode _saveMergeState] (in         IDEQuickLookEditor)
      4  0x00000001065f69f4 -[IDESourceControlConflictResolutionController         completeConflictResolution] (in IDEKit)
      5  0x000000010646d4f4 -[IDESourceControlMergeWindowController merge:] (in IDEKit)
      6  0x00007fff85a2b260 -[NSApplication sendAction:to:from:] (in AppKit)
      7  0x000000010566d200 __37-[DVTApplication sendAction:to:from:]_block_invoke (in         DVTKit)
      8  0x0000000105107ec2 DVTInvokeWithFailureHint (in DVTFoundation)
      9  0x000000010553777e -[DVTApplication sendAction:to:from:] (in DVTKit)
     10  0x00007fff85a2b0de -[NSControl sendAction:to:] (in AppKit)
     11  0x00007fff85a77c4d -[NSCell _sendActionFrom:] (in AppKit)
     12  0x00007fff85a91655 -[NSCell trackMouse:inRect:ofView:untilMouseUp:] (in AppKit)
     13  0x00007fff85a90a27 -[NSButtonCell trackMouse:inRect:ofView:untilMouseUp:] (in AppKit)
     14  0x00007fff85a9013d -[NSControl mouseDown:] (in AppKit)
     15  0x00007fff85a11a58 -[NSWindow sendEvent:] (in AppKit)
     16  0x00007fff859b05d4 -[NSApplication sendEvent:] (in AppKit)
     17  0x000000010610fc74 -[IDEApplication sendEvent:] (in IDEKit)
     18  0x00007fff858009f9 -[NSApplication run] (in AppKit)
     19  0x00007fff857eb783 NSApplicationMain (in AppKit)
     20  0x00007fff8e89d5fd start (in libdyld.dylib)

    Performing @selector(merge:) from sender NSButton 0x7fc4cd57e7e0
    abort() called

    Application Specific Signatures:
    (primaryDocumentLocation) != nil

Answer 1

我有类似的问题。

尝试将OS X更新到其最新版本（10.9.5），看看它是否能解决问题。

Answer 2

在这里遇到同样的问题并且非常令人不安！我解决它的方法是从命令行使用git merge并使用你拥有的任何diff工具，我只使用了opendiff标准。我知道不理想，但至少你可以开始......

合并2个分支时Xcode 6.0.1崩溃

2 个答案: