Bug 33335

Summary:	webkit-patch rollout should warn you about merge conflicts
Product:	WebKit	Reporter:	Eric Seidel (no email) <eric>
Component:	Tools / Tests	Assignee:	Nobody <webkit-unassigned>
Status:	NEW ---
Severity:	Normal	CC:	abarth
Priority:	P2
Version:	528+ (Nightly build)
Hardware:	PC
OS:	OS X 10.5

Description Eric Seidel (no email) 2010-01-07 12:14:30 PST

webkit-patch rollout should warn you about merge conflicts

This caused Adam trouble today:
http://trac.webkit.org/changeset/52937

Right now it ignores them, because they always happen for ChangeLogs:
http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/scm.py#L439

We need better detection of which ones we should ignore.

This blocks removing --complete-rollout I think.