Re: [html-tests] Update Windows instructions in README.md (#4184)

@thejohnjansen seems the “Add ECMAScript 6 Modules test cases” change (https://github.com/w3c/web-platform-tests/pull/4184/commits/e6fdc7d91a288d29ca07257ff74b87acb97a3928 / https://github.com/w3c/web-platform-tests/pull/4184/commits/360d873e28174948f1ee2ba4b4ea110619cc9ec4) got inadvertently committed to the branch. I guess that happened because the PR was made from the `master` branch of https://github.com/MicrosoftEdge/web-platform-tests.

To prevent things like this, it’s always better to create a branch in your wpt fork for each PR and commit there instead of `master`, and then open the PR from that non-`master` branch.

If you want, I can fix this so we can merge this PR, but it means I would need to force-push to the https://github.com/MicrosoftEdge/web-platform-tests `master` branch to cause the “Add ECMAScript 6 Modules test cases” change (https://github.com/MicrosoftEdge/web-platform-tests/commit/e6fdc7d91a288d29ca07257ff74b87acb97a3928) to be (temporarily) dropped from it.

After I did that and merge this PR you’d need to pull from https://github.com/MicrosoftEdge/web-platform-tests and then re-merge that “ES6 Modules test cases” change to `master` there again.

If you prefer to do it yourself (rather me being the one doing the force-push), what you’d need to is:

1. `git rebase -i 2782308f4187e73043324272552cf1bd90edc784`
   Your text editor will open and show you something like this:  <img width="545" alt="untitled" src="https://cloud.githubusercontent.com/assets/194984/20612639/66756088-b2ff-11e6-8056-5b23b8e4c0a8.png">

2. Change the above in your text editor so it looks like this: <img width="543" alt="untitled" src="https://cloud.githubusercontent.com/assets/194984/20612701/f2405546-b2ff-11e6-8bc5-bc38f9431646.png">

   That is, change the `pick e6fdc7d Add ECMAScript 6 Modules test cases` line to:
   `d e6fdc7d Add ECMAScript 6 Modules test cases`
    …and change the `pick 50a9973 Code review feedback` line to:
    `s 50a9973 Code review feedback`

3. Save and close your editor.
    Your editor will re-open. Just save what it shows as-is and close.

4. `git push -f`

After that we merge this PR but you’d still need to pull from https://github.com/MicrosoftEdge/web-platform-tests and then re-merge that “ES6 Modules test cases” change to `master` there again.


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

Received on Friday, 25 November 2016 02:22:13 UTC