cypress-io · jennifer-shehane · Nov 25, 2019 · Oct 24, 2019 · Oct 25, 2019 · Oct 28, 2019
diff --git a/CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
diff --git a/DEPLOY.md → .github/DEPLOY.md b/DEPLOY.md → .github/DEPLOY.md
diff --git a/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md
diff --git a/LICENSE.md → .github/LICENSE.md b/LICENSE.md → .github/LICENSE.md
diff --git a/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/automerge-pr-develop-master.yml b/.github/workflows/automerge-pr-develop-master.yml
@@ -0,0 +1,16 @@
+name: Merge PR - develop -> master
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  merge-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: maxkomarychev/merge-pal-action@v0.3.0
+        if: github.event.pull_request.head.ref == 'develop'
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/create-pr-develop-to-master.yml b/.github/workflows/create-pr-develop-to-master.yml
@@ -0,0 +1,18 @@
+name: Create PR - develop -> master
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - develop
+
+jobs:
+    pull-request:
+      runs-on: ubuntu-latest
+      steps:
+      - uses: actions/checkout@master
+      - name: pull-request
+        uses: repo-sync/pull-request@v2
+        if: github.event.pull_request.merged == true
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.textlintrc b/.textlintrc
@@ -99,6 +99,9 @@
         ["licence", "license"],
         ["organise", "organize"],
 
+        // Common misspellings
+        ["gaurantee", "guarantee"],
+
         // Words we would like to not use altogether
         ["simply", ""],