From 04d9d701e59e80bce56590fb4336cc15318eeb35 Mon Sep 17 00:00:00 2001
From: laurentheirendt <laurent.heirendt@uni.lu>
Date: Wed, 28 Aug 2019 19:05:19 +0200
Subject: [PATCH] minor changes
---
2019/2019-06-11_gitTraining/slides/best_practices.md | 11 -----------
2019/2019-06-11_gitTraining/slides/qualityCode.md | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/2019/2019-06-11_gitTraining/slides/best_practices.md b/2019/2019-06-11_gitTraining/slides/best_practices.md
index 63c85174..dea55fee 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 1cc539a1..24abf2c8 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>
--
GitLab