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

[bugzilla-daemon at webkit.org]

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


Dirk Pranke <dpranke at chromium.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |abarth at webkit.org,
                   |                            |eric at webkit.org,
                   |                            |maruel at chromium.org,
                   |                            |ojan at chromium.org,
                   |                            |tony at chromium.org




--- Comment #1 from Dirk Pranke <dpranke at chromium.org>  2012-10-18 13:58:36 PST ---
As I discussed over IM w/ hclam, we currently treat TestExpectations like any other text file, and so some merges work but some don't.

However, I don't really know much about how patch works; perhaps there are some flags we could add (or a special merge driver we could write) that would make merging easier or more robust.

Anyone have any ideas?

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