From 737150a3a90394e0363adae55c765aab5ac7d585 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Mon, 3 Jun 2019 11:14:50 +0200
Subject: [PATCH] Update git info blocks
---
Doc/Sd1/objectsClasses.xml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Doc/Sd1/objectsClasses.xml b/Doc/Sd1/objectsClasses.xml
index 7b6b1d26e..0eeb6763a 100644
--- a/Doc/Sd1/objectsClasses.xml
+++ b/Doc/Sd1/objectsClasses.xml
@@ -12221,9 +12221,11 @@ Switched to branch 'master'</screen>
<info>
<abstract>
- <para>Connecting to a remote repository.</para>
+ <para>Connecting local to remote repository or clone</para>
- <para>Handling conflicts.</para>
+ <para>push local to remote</para>
+
+ <para>pull from remote to local</para>
</abstract>
</info>
@@ -12513,9 +12515,9 @@ Unpacking objects: 100% (5/5), done.
<info>
<abstract>
- <para>Two user editing conflicts</para>
+ <para>Line level conflicts</para>
- <para>Code merging</para>
+ <para>Manual merge</para>
</abstract>
</info>
--
GitLab