> On Sep 26, 2020, at 8:13 PM, Darin Adler <darin at apple.com> wrote: > > by rebasing and either regenerating the expected.txt files hand editing. … resolve the conflicts by rebasing and either regenerating the expected.txt files with run-webkit-tests or by hand editing the expected.txt files. — Darin