master > main

Author: eric-burel

README.md

@@ -27,7 +27,7 @@ You can't teach an old dog new tricks! Vulcan Next is the successor of "Vulcan.j
 ## Install and run in 5 minutes
 
 ```sh
-git clone https://github.com/VulcanJS/vulcan-next.git
+git clone -b main https://github.com/VulcanJS/vulcan-next
 yarn
 yarn run dev
 ```
@@ -56,7 +56,7 @@ have to apply the updates by hand, comparing Vulcan Next latest version to your
 # Get the latest version of Vulcan Next locally
 git fetch upstream
 # Merge to your own code (favouring your own code as a default in case of conflict)
-git merge upstream/master -X ours
+git merge upstream/main -X ours
 ```
 
 ### Roll your own Mongo database

src/content/docs/contributing.md

@@ -12,10 +12,10 @@ We recommend to install Node using [NVM for Linux/Mac](https://github.com/nvm-sh
 
 We follow the Git Flow model.
 
-- `master`: is the current live version.
-- `bugfix/*`: Bugfixes branches should start from master.
-- `devel`: Devel is the next version.
-- `feature/*`: features branches should start from master.
+- `devel`: Devel is the next version. **This is where you want to start for contribution**.
+- `main`: is the current live version.
+- `bugfix/*`: Bugfixes branches should start from main.
+- `feature/*`: features branches should start from devel.
 - `support/*x.x.x*`: is for bugfixes for a specific version.
 - Tags allow to easily find the commit corresponding to a deployed versions.
 

src/content/docs/release-process.md

@@ -4,11 +4,11 @@
 
 ```sh
 ### To the right branch
-git checkout master && git pull
+git checkout main && git pull
 git checkout devel && git pull
 # cat package.json | grep version # to get the current version
 # git checkout -b release/<next-version>
-git merge master # get hot fixes if any
+git merge main # get hot fixes if any
 git merge devel
 rm -Rf node_modules
 yarn install # no missing module surprise
@@ -75,10 +75,10 @@ git commit -am "bump version"
 ```sh
 
 ### Deploy
-git checkout master && git merge release/<next-version>
+git checkout main && git merge release/<next-version>
 git push
 
 ### Update devel branches with fixes
-git checkout develop && git pull && git merge master && git push
+git checkout develop && git pull && git merge main && git push
 
 ```