From 863aef10dbd98fe4d3f895a106ec86312b9a8866 Mon Sep 17 00:00:00 2001
From: Joey Aghion <joey@aghion.com>
Date: Thu, 18 Nov 2021 17:57:39 -0500
Subject: [PATCH] Rename main branch from master to main

---
 .circleci/config.yml | 8 ++++----
 CONTRIBUTING.md      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c57c593..105f3f1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,11 +10,11 @@ not_staging_or_release: &not_staging_or_release
         - staging
         - release
 
-only_master: &only_master
+only_main: &only_main
   context: hokusai
   filters:
     branches:
-      only: master
+      only: main
 
 only_release: &only_release
   context: hokusai
@@ -30,12 +30,12 @@ workflows:
 
       - hokusai/push:
           name: push-staging-image
-          <<: *only_master
+          <<: *only_main
           requires:
             - hokusai/test
 
       - hokusai/deploy-staging:
-          <<: *only_master
+          <<: *only_main
           project-name: 'doppler'
           requires:
             - push-staging-image
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4abf246..91fe39f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,8 +18,8 @@ git remote add upstream https://github.com/artsy/doppler.git
 Make sure your fork is up-to-date and create a topic branch for your feature or bug fix.
 
 ```
-git checkout master
-git pull upstream master
+git checkout main
+git pull upstream main
 git checkout -b my-feature-branch
 ```
 
@@ -96,11 +96,11 @@ Go to https://github.com/contributor/doppler and select your feature branch. Cli
 
 #### Rebase
 
-If you've been working on a change for a while, rebase with upstream/master.
+If you've been working on a change for a while, rebase with upstream/main.
 
 ```
 git fetch upstream
-git rebase upstream/master
+git rebase upstream/main
 git push origin my-feature-branch -f
 ```