From 1904623b7596450c5c9c1cac1e7a0af374ce6c0c Mon Sep 17 00:00:00 2001
From: Christian Krause <christian.krause@idiv.de>
Date: Fri, 13 Sep 2019 12:47:24 +0200
Subject: [PATCH] do collaboration in feature branches
---
basics.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/basics.html b/basics.html
index c2e5841..ccfc2ab 100644
--- a/basics.html
+++ b/basics.html
@@ -937,7 +937,7 @@
- we: new commit
- group: fetch, lol, pull upstream master, lol
- group: push origin, lol
- - group: commit, push, MR (master or wip?)
+ - group: branch, switch, commit, push, MR
- collaboration happens in issues and MR discussion!
- we: review and possible resolve merge request in GL
- show next slide once merging is done on command line
--
GitLab