diff --git a/Doc/Sd1/objectsClasses.xml b/Doc/Sd1/objectsClasses.xml index 7b6b1d26ea6ef3fa567f74b28f122594f90d4f83..0eeb6763aa61d57d78f7eb3d73c59bb1112070ce 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>