216330 2020-09-09 15:37:48 -0700 WPT exporter should use --3way when patch is from git 2022-03-28 09:29:40 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 238446 InRadar P2 Normal --- 238446 1 gsnedders webkit-unassigned noam ntim webkit-bug-importer youennf oldest_to_newest 1687166 0 gsnedders 2020-09-09 15:37:48 -0700 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. 1689243 1 webkit-bug-importer 2020-09-16 15:38:14 -0700 <rdar://problem/69019391> 1855564 2 noam 2022-03-28 06:09:57 -0700 https://bugs.webkit.org/show_bug.cgi?id=238446 resolves 1855636 3 ntim 2022-03-28 09:29:40 -0700 *** This bug has been marked as a duplicate of bug 238446 ***