From 5993e5bcab1170fec175994eae93b67bd97c76cb Mon Sep 17 00:00:00 2001
From: Christian Krause <christian.krause@idiv.de>
Date: Thu, 11 Oct 2018 10:49:27 +0200
Subject: [PATCH] adds conflicts section
---
basics.html | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/basics.html b/basics.html
index 0ba996f..7e9eb82 100644
--- a/basics.html
+++ b/basics.html
@@ -754,13 +754,32 @@
</section>
<section id="collab-conflicts" data-markdown>
- ## conflicts
+ ## resolving conflicts
+ ### maintainer
+
+ ```bash
+ git remote add alice https://...
+ git fetch alice
+ git checkout master
+ git merge alice/topic/feature
+ # fix conflicts
+ git push
+ ```
+
+ ### contributor
+
+ ```bash
+ git fetch upstream
+ git checkout topic/feature
+ git merge origin/master
+ # fix conflicts
+ git push
+ ```
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
+ - maintainer decides if trivial or delegate to contributor
</section>
</section>
--
GitLab