RESOLVED DUPLICATE of bug 238446 216330
WPT exporter should use --3way when patch is from git 
https://bugs.webkit.org/show_bug.cgi?id=216330
Summary WPT exporter should use --3way when patch is from git
Sam Sneddon [:gsnedders]
Reported 2020-09-09 15:37:48 PDT
When we're running on a git checkout of WebKit, the WPT exporter just gets its patch from `git diff`. This includes blob IDs, which means we can then use `git apply --3way` when applying the patch to the WPT tree, which has a better chance of succeeding (unless the file got modified during import) as the blob the patch applies to is recorded and therefore git doesn't just blindly try to apply it to the tip-of-tree of WPT, but can use its merge machinery.
Attachments
Add attachment proposed patch, testcase, etc.
Radar WebKit Bug Importer
Comment 1 2020-09-16 15:38:14 PDT
<rdar://problem/69019391>
Noam Rosenthal
Comment 2 2022-03-28 06:09:57 PDT
https://bugs.webkit.org/show_bug.cgi?id=238446 resolves
Tim Nguyen (:ntim)
Comment 3 2022-03-28 09:29:40 PDT
*** This bug has been marked as a duplicate of bug 238446 ***
Note You need to log in before you can comment on or make changes to this bug.