[Webkit-unassigned] [Bug 36560] New: resolve-ChangeLogs: git-rebase fails when resolve-ChangeLogs can't merge

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=36560

           Summary: resolve-ChangeLogs: git-rebase fails when
                    resolve-ChangeLogs can't merge
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Other
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: New Bugs
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: ddkilzer at webkit.org
                CC: eric at webkit.org, cjerdonek at webkit.org



David Kilzer (ddkilzer) <ddkilzer at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #51549|                            |review?
               Flag|                            |


Created an attachment (id=51549)
 --> (https://bugs.webkit.org/attachment.cgi?id=51549)
Patch

When resolve-ChangeLogs fails to merge a patch while running as
    a git merge driver, it deletes the original file, which causes
    an internal failure and stops git mid-merge:

        fatal: Failed to execute internal merge

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.