From be9b21f4e96a5a5782c101bf4c1119e1bb8ba57b Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Tue, 25 Aug 2020 14:51:57 -0400
Subject: [PATCH 1/2] Document release branches

---
 .github/pull_request_template.md |  2 ++
 doc/CONTRIBUTING.md              | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6e29ad1b541c..4cdeac9f7b66 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,4 +1,6 @@
 <!--
 Please link to the issue this PR solves.
 If there is no existing issue, please first create one unless the fix is minor.
+
+Please make sure the base of your PR is the master branch!
 -->
diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md
index af04b57ccf7d..765807696f2e 100644
--- a/doc/CONTRIBUTING.md
+++ b/doc/CONTRIBUTING.md
@@ -2,6 +2,7 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Contributing
 
+- [Pull Requests](#pull-requests)
 - [Requirements](#requirements)
 - [Development Workflow](#development-workflow)
 - [Build](#build)
@@ -12,6 +13,16 @@
 
 - [Detailed CI and build process docs](../ci)
 
+## Pull Requests
+
+Please link to the issue each PR solves.
+If there is no existing issue, please first create one unless the fix is minor.
+
+Please make sure the base of your PR is the master branch. We keep the github
+default branch the latest release branch to avoid confusion as the
+documentation is on GitHub and we don't want users to see docs on unreleased
+features.
+
 ## Requirements
 
 Please refer to [VS Code's prerequisites](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites).

From 74bb3734ab54a7e742d6d3b0dd54f5d5ddf4bab7 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Wed, 26 Aug 2020 07:07:43 -0400
Subject: [PATCH 2/2] Update doc/CONTRIBUTING.md

Co-authored-by: Asher <ash@coder.com>
---
 doc/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md
index 765807696f2e..b8b01492c71c 100644
--- a/doc/CONTRIBUTING.md
+++ b/doc/CONTRIBUTING.md
@@ -18,7 +18,7 @@
 Please link to the issue each PR solves.
 If there is no existing issue, please first create one unless the fix is minor.
 
-Please make sure the base of your PR is the master branch. We keep the github
+Please make sure the base of your PR is the master branch. We keep the GitHub
 default branch the latest release branch to avoid confusion as the
 documentation is on GitHub and we don't want users to see docs on unreleased
 features.