NEW 33335
webkit-patch rollout should warn you about merge conflicts 
https://bugs.webkit.org/show_bug.cgi?id=33335
Summary webkit-patch rollout should warn you about merge conflicts
Eric Seidel (no email)
Reported 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.
Attachments
Add attachment proposed patch, testcase, etc.
Note You need to log in before you can comment on or make changes to this bug.