docs: Add documentation about using EGit & Capella

DSD-DBS · Oct 10, 2023 · e4a8970 · e4a8970
1 parent 1e68933
commit e4a8970
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/docs/user/docs/tools/capella/working-with-git.md b/docs/user/docs/tools/capella/working-with-git.md
@@ -98,6 +98,7 @@ changes (2).
 
 ![Step 7: Search for View](working-with-git/staged-changes.png)
 
+<<<<<<< HEAD:docs/user/docs/tools/capella/working-with-git.md
 If you already committed your changes you can right click on the Project >
 "Team" > "Push to Origin" in order to push your changes to the remote.
 
@@ -156,3 +157,14 @@ automatically or not:
     1. Redo your work. We recommend using a new session for that.
     1. Open a service request or contact the operations team in order to try to
       get your changes merged manually.
+=======
+In order to publish your changes and to share them with your team rather click:
+"Commit and Push" (1). If you have not configured that before you are now asked
+to "Configure upstream for push and pull" and the selected default of "Merge"
+can just be kept. You might now be asked to enter a user and a password for the
+remote repository in order to push your changes there. Having done that you can
+click "Push".
+
+Now your changes are saved at the remote repository where they are not lost and
+your collegues can see them.
+>>>>>>> af872c6c (docs: Add documentation about using EGit & Capella):docs/user/docs/getting-started/working-with-git.md
diff --git a/docs/user/docs/tools/capella/working-with-git/create-merge-branch.png b/docs/user/docs/tools/capella/working-with-git/create-merge-branch.png
diff --git a/docs/user/docs/tools/capella/working-with-git/create-merge-branch.png.license b/docs/user/docs/tools/capella/working-with-git/create-merge-branch.png.license
diff --git a/docs/user/docs/tools/capella/working-with-git/open-reset-view.png b/docs/user/docs/tools/capella/working-with-git/open-reset-view.png
diff --git a/docs/user/docs/tools/capella/working-with-git/open-reset-view.png.license b/docs/user/docs/tools/capella/working-with-git/open-reset-view.png.license
diff --git a/docs/user/docs/tools/capella/working-with-git/reset-hard-view.png b/docs/user/docs/tools/capella/working-with-git/reset-hard-view.png
diff --git a/docs/user/docs/tools/capella/working-with-git/reset-hard-view.png.license b/docs/user/docs/tools/capella/working-with-git/reset-hard-view.png.license