合并2个分支时Xcode 6.0.1崩溃 [英] Xcode 6.0.1 crashes when merging 2 branches

问题描述

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

到目前为止，我有：

1. 合并相同的分支（明显推动它们并将它们拉出），它仍然崩溃。
   

2. 创建一个来自错误分支的新分支，并在其中添加一个空格，并将其合并到错误分支中并成功。但无法将它合并到我想要的原始分支中。
   





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



编辑2




1. 在解决Xcode合并编辑器中的冲突之后，其中一个文件有冲突，不仅在试图合并时，而且即使试图查看其他文件时也会崩溃（查看其他文件在解决冲突之前不会崩溃）。
   

2. 以这种方式编辑其中一个分支以避免合并时的冲突将节省解决冲突，但Xcode在合并时仍会崩溃




编辑 - 添加崩溃警报：



 过程：Xcode [3146] 
路径：/Applications/Xcode.app/Contents/MacOS/Xcode 
标识符：com.apple.dt.Xcode 
版本：6.0.1（6528）
版本信息：IDEFrameworks-6528000000000000〜2 
应用程序项目ID：497799835 
应用程序外部ID：712682811 
代码类型： X86-64（Native）
父进程：launchd [162] 
责任人：Xcode [3146] 
用户名：501 
 
日期/时间：2014-09 -30 15：30：49.320 +0300 
操作系统版本：Mac OS X 10.9.4（13E28）
报告版本：11 
匿名UUID：3A19C91F-0A10-76C9-10BB-C3B0EABB5390 
 
 
崩溃的线程：0调度队列：com.apple.main-thread 
 
异常类型：EXC_CRASH（SIGABRT）
异常代码：0x0000000000000000，0x0000000000000000 
 
特定于应用程序的信息：
发送合并：为< IDESourceControlMergeWindowController：0x7fc4d0974a90>来自< NSButton：0x7fc4cd57e7e0> 
 ProductBuildVersion：6A317 
 / SourceCache / IDEPlugins / IDEPlugins- 6244 / IDEQuickLookEditor / Comparison / IDEQuickLookVersionsTwoUpSubmode.m中的ASSERTION FAILURE：
详细信息：primaryDocumentLocation应该是一个从IDESourceControlDocumentLocation继承的实例，但它是无
对象：< IDEQuickLookVersionsTwoUpSubmode：0x7fc4d0e515d0> 
方法：-_saveMergeState 
线程：< NSThread：0x7fc4c9716f00> {name =（null），num = 1} 
提示：
 0：发送合并：到< IDESourceControlMergeWindowController ：0x7fc4d0974a90>来自< NSButton：0x7fc4cd57e7e0> 
 Backtrace：
 0x0000000106343f0a  -  [IDEAssertionHandler handleFailureInMethod：object：fileName：lineNumber：assertionSignature：messageFormat：arguments：]（在IDEKit中）
 1 0x0000000105106baf _DVTAssertionHandler（在DVTFoundation中）
 2 0x0000000105106e9e _DVTAssertionFailureHandler（在DVTFoundation）
 3分配0x00000001150b4cee  -  [IDEQuickLookVersionsTwoUpSubmode _saveMergeState]（在IDEQuickLookEditor）
 4分配0x00000001065f69f4  -  [IDESourceControlConflictResolutionController completeConflictResolution]（在IDEKit）
 5分配0x000000010646d4f4  -  [IDESourceControlMergeWindowController合并：]（在IDEKit）
 0x00007fff85a2b260  -  [NSApplication sendAction：to：from：]（in AppKit）
 7 0x000000010566d200 __37- [DVTApplication sendAction：to：from：] _ block_invoke（in DVTKit）
 8 0x0000000105107ec2 DVTInvokeWithFailureHint（在DVTFoundation中）
 9 0x000000010553777e  -  [DVTApplica （在AppKit中）
 11 0x00007fff85a77c4d  -  [NSCell _sendActionFrom：]（在AppKit中）
 10（在AppKit中）sendBar： 12 0x00007fff85a91655  -  [NSCell tr​​ackMouse：inRect：ofView：untilMouseUp：]（在AppKit中）
 13 0x00007fff85a90a27  -  [NSButtonCell tr​​ackMouse：inRect：ofView：untilMouseUp：]（在AppKit中）
 14 0x00007fff85a9013d  -  [NSControl mouseDown ：]（在AppKit中）
 15 0x00007fff85a11a58  -  [NSWindow sendEvent：]（在AppKit中）
 16 0x00007fff859b05d4  -  [NSApplication sendEvent：]（在AppKit中）
 17 0x000000010610fc74  -  [IDEApplication sendEvent：] （在IDEKit中）
 18 0x00007fff858009f9  -  [NSApplication run]（在AppKit中）
 0x00007fff857eb783 NSApplicationMain（在AppKit中）
 20 0x00007fff8e89d5fd start（在libdyld.dylib中）
 
执行@selector（merge :) from sender NSButton 0x7fc4cd57e7e0 
 abort（）调用
 
特定于应用程序的签名： 
（primaryDocumentLocation）！= nil 
  




解决方案

I有一个类似的问题。





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




Every time I try to merge a branch into another branch Xcode 6.0.1 crashes.

So far I have:

1. Tried from a different computer to merge the same branches (pushed them and pulled them before obviously) and it still crashes.

2. Created a new branch from the "faulty branch" added a space in it and merged it back into the "faulty branch" with success. but couldn't merge it into the original branch i wanted to.

Whats wrong with Xcode ? How can I merge the branches ? (there are about 100 files to merge)

EDIT 2

1. One of the files has a conflict, after resolving the conflict in the Xcode merge editor, it will crash not only when trying to merge but even when trying to look at on of the other files (looking at other files doesn't crash before resolving the conflict).

2. editing one of the branches in such a way to avoid the conflict upon merging will save resolving the conflict, but Xcode will still crash when hitting merge

EDIT - adding the crash alert :

    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

解决方案

I had a similar issue.

Try to update the OS X to its latest version (10.9.5) and see if its solves the problem.

这篇关于合并2个分支时Xcode 6.0.1崩溃的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！