[Webkit-unassigned] [Bug 99755] New: Avoid merge conflicts with TestExpectations

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Thu Oct 18 13:55:47 PDT 2012


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

           Summary: Avoid merge conflicts with TestExpectations
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Unspecified
        OS/Version: Unspecified
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: hclam at google.com
                CC: dpranke at chromium.org


Appending new test expectations to the end of file often results in merge conflicts.

For example patches in this bug: https://bugs.webkit.org/show_bug.cgi?id=94240. Almost everytime I uploaded I had to merge manually even the expectations are appended.

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



More information about the webkit-unassigned mailing list