Skip to content
Snippets Groups Projects
Commit b990c047 authored by Sven Mäder's avatar Sven Mäder :speech_balloon:
Browse files

Merge branch 'local-rda' into 'master'

Update readme

See merge request core/python!7
parents e2c346fc 12ab38fc
No related branches found
No related tags found
1 merge request!7Update readme
...@@ -110,7 +110,7 @@ This gitlab repo will be cloned to many locations, and the `master` branch shoul ...@@ -110,7 +110,7 @@ This gitlab repo will be cloned to many locations, and the `master` branch shoul
### branching ### branching
To contribute create your own **local-<yourname>** branch or a **feature/bugfix** branch: To contribute create your own **`local-<yourname>`** branch or a **feature/bugfix** branch:
``` ```
git checkout -b newfeature git checkout -b newfeature
...@@ -127,7 +127,7 @@ git push ...@@ -127,7 +127,7 @@ git push
### pull request ### pull request
Git will show you the link to open a **pull request**: After the push, git will show you the link to open a **pull request**:
``` ```
remote: To create a merge request for local-rda, visit: remote: To create a merge request for local-rda, visit:
...@@ -148,7 +148,7 @@ Let someone review it and discuss. **Changes** shows the diff. ...@@ -148,7 +148,7 @@ Let someone review it and discuss. **Changes** shows the diff.
Once it is ready to be merged: Once it is ready to be merged:
- merge it by clicking the green **Merge** button - merge it by clicking the green **Merge** button
- remove source branch now with the **Remove Source Branch** button - remove source branch now with the **Remove Source Branch** button (optional)
### pull in feature branch ### pull in feature branch
...@@ -159,6 +159,8 @@ git checkout newfeature ...@@ -159,6 +159,8 @@ git checkout newfeature
git pull --rebase origin/master git pull --rebase origin/master
``` ```
This will do a fast-forward merge.
### pull in `master` branch ### pull in `master` branch
``` ```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment