From 80dadee8f3a5a426451d715fbc660fc4f483ddde Mon Sep 17 00:00:00 2001
From: Christian Krause <christian.krause@idiv.de>
Date: Wed, 10 Oct 2018 18:06:49 +0200
Subject: [PATCH] adds some notes
---
basics.html | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/basics.html b/basics.html
index 37ffb29..0ba996f 100644
--- a/basics.html
+++ b/basics.html
@@ -618,7 +618,9 @@
notes:
- collaboration needs remote repositories
- - by-product of remotes is backup
+ - by-product of remotes is backup: my `~/projects` does not need to
+ be backed up because **every** project is under version control
+ and has a remote
</section>
<section id="distributed-remotes" data-markdown>
@@ -757,6 +759,8 @@
notes:
- hopefully conflicting changes
- MR status should show that (can not be merged without conflicts)
+ - TODO explain merge or rebase
+ - TODO show both variants from maintainer and contributor
</section>
</section>
--
GitLab