From e455d310e7e6f45ecda6f82af9b11f90b0d1a67f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFck=20Piera?= <pyrech@gmail.com>
Date: Fri, 9 Apr 2021 13:30:14 +0200
Subject: [PATCH] Rename master branch to main

---
 .github/workflows/ci.yml | 2 +-
 CONTRIBUTING.md          | 8 ++++----
 VERSIONING.md            | 4 ++--
 composer.json            | 5 -----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 549c2eb..3d0483b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
     push:
-        branches: [ master ]
+        branches: [ main ]
     pull_request:
     schedule:
         -   cron: '0 0 * * MON'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ce18495..6148043 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,11 +73,11 @@ git remote add upstream https://github.com/jolicode/JoliNotif.git
 Then get the upstream changes:
 
 ```shell
-git checkout master
-git pull --rebase origin master
-git pull --rebase upstream master
+git checkout main
+git pull --rebase origin main
+git pull --rebase upstream main
 git checkout <your-branch>
-git rebase master
+git rebase main
 ```
 
 Finally, publish your changes:
diff --git a/VERSIONING.md b/VERSIONING.md
index 8a5cab0..ada158a 100644
--- a/VERSIONING.md
+++ b/VERSIONING.md
@@ -17,6 +17,6 @@ The versioning is inspired by [Semantic Versioning](http://semver.org/):
 The branching is inspired by [@jbenet](https://github.com/jbenet)
 [simple git branching model](https://gist.github.com/jbenet/ee6c9ac48068889b0912):
 
-> 1. `master` must always be deployable.
+> 1. `main` must always be deployable.
 > 2. **all changes** are made through feature branches (pull-request + merge)
-> 3. rebase to avoid/resolve conflicts; merge in to `master`
+> 3. rebase to avoid/resolve conflicts; merge in to `main`
diff --git a/composer.json b/composer.json
index 69f2cb6..d4dda76 100644
--- a/composer.json
+++ b/composer.json
@@ -29,11 +29,6 @@
         "symfony/finder": "^3.3|^4.0|^5.0",
         "symfony/phpunit-bridge": "^3.4.26|^4.0|^5.0"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.3.x-dev"
-        }
-    },
     "bin": [
         "jolinotif"
     ],