diff --git a/2022/2022-05-31_git-triology-part-1/slides/best_practices.md b/2022/2022-05-31_git-triology-part-1/slides/best_practices.md index 170289734dadf2166a3b8109a21e14d7bbf3f9ea..f430fdfa5f9c4916cdf1654684259b260ba89a18 100644 --- a/2022/2022-05-31_git-triology-part-1/slides/best_practices.md +++ b/2022/2022-05-31_git-triology-part-1/slides/best_practices.md @@ -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) diff --git a/2022/2022-05-31_git-triology-part-1/slides/merge.md b/2022/2022-05-31_git-triology-part-1/slides/merge.md index 18d0c3674cfbe57c3182928bb7ed03395f68eca9..c6311a79b8f9cfa3886d1b089878343c9a427bd9 100644 --- a/2022/2022-05-31_git-triology-part-1/slides/merge.md +++ b/2022/2022-05-31_git-triology-part-1/slides/merge.md @@ -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**!