summaryrefslogtreecommitdiff
path: root/docs/en/developers/02_Github.md
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2019-12-15 14:08:49 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2019-12-15 14:08:49 +0100
commit82851d2039f619f1b2558e06b04a9e47fceeea54 (patch)
treeab3142289e260111c686e740b9f4214453a0a84c /docs/en/developers/02_Github.md
parent0765840d9d0998bd09a2cf7c4fe97785c791fc9b (diff)
Make master the rolling release branch (#2705)
* Change default TAG in Makefile We are going to drop the `dev` branch. The Docker tag `dev-*` are based on this branch and so there will be no longer be generated. We must use images based on the `master` branch (i.e. `latest`, `alpine` and `arm`). * Remove references to dev branch in documentation * Synchronize French documentation
Diffstat (limited to 'docs/en/developers/02_Github.md')
-rw-r--r--docs/en/developers/02_Github.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/en/developers/02_Github.md b/docs/en/developers/02_Github.md
index a1677d2af..a898dc23e 100644
--- a/docs/en/developers/02_Github.md
+++ b/docs/en/developers/02_Github.md
@@ -88,8 +88,8 @@ git remote -v show
Now you can pull the latest development code:
```bash
-git checkout dev
-git pull upstream dev
+git checkout master
+git pull upstream master
```
## Starting a new development branch
@@ -110,7 +110,7 @@ git show
git push
```
-Now you can create a PR based on your branch. Please make sure to file it against the `dev` branch!
+Now you can create a PR based on your branch.
## How to write a commit message