From ed3892e36ea2cf98d59d78b3109d7efa88ea2240 Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Sun, 7 Jan 2018 09:07:01 +0100
Subject: [PATCH] Meta: define merge policy and add CONTRIBUTING.md

Helps with https://github.com/whatwg/meta/issues/65.
---
 .travis.yml     | 2 +-
 CONTRIBUTING.md | 1 +
 README.md       | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/.travis.yml b/.travis.yml
index 672474094..f58210e78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ env:
     - ENCRYPTION_LABEL="0a03797be0f9"
 
 script:
-  - curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh
+  - make deploy
 
 branches:
   only:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..d24f6726e
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1 @@
+Please see the [contributor guidelines](https://github.com/whatwg/meta/blob/master/CONTRIBUTING.md).
diff --git a/README.md b/README.md
index 5346547fb..51b32b77f 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,11 @@ End tags may be included (if done consistently) and attributes may be quoted (us
 though the prevelant theme is to omit end tags and not quote attributes (unless they contain a
 space).
 
+### Merge policy
+
+If you can commit to this repository, see the
+[html repository's TEAM](https://github.com/whatwg/html/blob/master/TEAM.md) for guidelines.
+
 ### Tests
 
 Tests can be found in the `dom/` directory of