> On Sep 26, 2020, at 8:13 PM, Darin Adler <da...@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
_______________________________________________
webkit-dev mailing list
webkit-dev@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-dev

Reply via email to