[webkit-reviews] review requested: [Bug 36560] resolve-ChangeLogs: git-rebase fails when resolve-ChangeLogs can't merge : [Attachment 51549] Patch

[bugzilla-daemon at webkit.org]

David Kilzer (ddkilzer) <ddkilzer at webkit.org> has asked  for review:
Bug 36560: resolve-ChangeLogs: git-rebase fails when resolve-ChangeLogs can't
merge
https://bugs.webkit.org/show_bug.cgi?id=36560

Attachment 51549: Patch
https://bugs.webkit.org/attachment.cgi?id=51549&action=review

------- Additional Comments from David Kilzer (ddkilzer) <ddkilzer at webkit.org>
    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