Re: [2dcontext-tests] Add tests for Canvas2D imageSmoothingEnabled (#2416) from Michael[tm] Smith on 2016-08-15 (public-web-platform-tests-notifications@w3.org from August 2016)

From: Michael[tm] Smith <web-platform-tests-notifications@w3.org>
Date: Mon, 15 Aug 2016 08:34:19 GMT
To: public-web-platform-tests-notifications@w3.org
Message-Id: <<web-platform-tests_issue_2416_1471250059784@w3.org>>

This branch has a merge conflict that I don’t yet understand how to resolve:
```
$ git pull https://github.com/Elchi3/web-platform-tests.git imageSmoothingEnabled
>From https://github.com/Elchi3/web-platform-tests
 * branch            imageSmoothingEnabled -> FETCH_HEAD
CONFLICT (file/directory): There is a directory with name tools in ebc53e7d4cc4695ca6483eeca4abf74d2a773b6b. Adding tools as tools~HEAD
Auto-merging quirks-mode/percentage-height-calculation.html
Automatic merge failed; fix conflicts and then commit the result.
Error redoing merge bd10f223822a24de20e12fce1b3cde3d4998176e
```

I guess that has something to do with the changes we made to `tools` in the time since the branch for this PR was originally created. But I don’t know how to resolve it.

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

Received on Monday, 15 August 2016 08:34:27 UTC