diff --git a/2019/2019-06-11_gitTraining/slides/best_practices.md b/2019/2019-06-11_gitTraining/slides/best_practices.md index 63c851741e6196ca01e129708adb3ed494c38807..dea55feec7e3ad5a6717044baf28d41001ce6d4d 100644 --- a/2019/2019-06-11_gitTraining/slides/best_practices.md +++ b/2019/2019-06-11_gitTraining/slides/best_practices.md @@ -1,31 +1,20 @@ # Best practices * `pull` before `push` - * Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop` - * Do **not push** to `master`, but **submit a PR** - * Get your code **reviewed** by your peers (submit a PR!) - * Submit a PR **often**! - * `clone` a repository, do not download the `.zip` file. - - * Do **not** combine `git` commands ```bash $ git commit -am "myMessage" # do not do this ``` - * Stage only 1 file at once using - ```bash $ git add myFile.md ``` - * Commit **only a few files** at once (after multiple separate `git add` commands) - * `Push` often - avoid conflicts Remember: **A `push` a day keeps conflicts away!** diff --git a/2019/2019-06-11_gitTraining/slides/qualityCode.md b/2019/2019-06-11_gitTraining/slides/qualityCode.md index 1cc539a1162524f2c56a6b38cc648deca2dd08c7..24abf2c8bba903e0f4e213e3fc049ad7f253636b 100644 --- a/2019/2019-06-11_gitTraining/slides/qualityCode.md +++ b/2019/2019-06-11_gitTraining/slides/qualityCode.md @@ -14,7 +14,7 @@ … actually, **EVERYONE** writing documentation, a script, or code is concerned! <div align="center"> -<img src="slides/img/snoopy.png"> +<img src="slides/img/snoopy.png" height="400px"> </div>