Re: [html-tests] Add tests for turning off spellchecking (#4608)

> is there an official preference between rebasing on top of master or merging master into the PR branch? I'd tend to prefer the later, but if we have a policy in favor of rebasing, I'll be happy to comply.

There is no WPT policy for that. There are very few policies for WPT, I guess because we haven’t found that the lack of them causes any serious problems.

That said, I think for PRs there are good reasons for people to choose rebasing on top of master over merging master into the PR branch. For one thing, it seems clearly preferable not to be merge back to master a PR branch as-is that itself has a bunch of merges from master in it.

Many of us follow the common convention of squashing a PR branch down to a single commit before merging it master (to keep the history on master more readable etc)—and so if you’re going to be squashing it all at the end anyway, you might as well be rebasing the PR branch along the way, if you need/want to be pulling in changes from master to it while you’re working on it.



View on GitHub: https://github.com/w3c/web-platform-tests/pull/4608#issuecomment-299361545

Received on Friday, 5 May 2017 03:22:42 UTC