Skip to content
Snippets Groups Projects
Commit b282aff4 authored by Vilem Ded's avatar Vilem Ded
Browse files

pull request is not used as the pull command is not introduced

parent 1a3d035e
No related branches found
No related tags found
2 merge requests!129[release] Regular merge of develop,!121git part 1
......@@ -38,7 +38,7 @@
## Best practices
* Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop`
* Do **not commit** to `master`/`develop`, but **submit a merge Request (PR)**
* Do **not commit** to `master`/`develop`, but **submit a merge request (MR)**
* Get your code **reviewed** by your peers (submit a merge request!)
* Submit a merge request **often**! (as soon as the feature is ready)
* Make commits often (keeps increments small)
......
......@@ -12,9 +12,10 @@ You have to <font color="color:red">merge</font> the branches.
**Remarks**: merging is directional - *Merge branch A to branch B*
### The merge is initiated via so called **merge request**
*Requesting* someone (from the original repository) to *merge* your changes.
* *Requesting* someone (from the original repository) to *merge* your changes.
* *merge request* is commonly abreviated as **MR**
Your peers can comment on your changes in a **review**!
Your peers can comment on your changes in a merge request **review**!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment