docs: Add documentation on how to merge if merging is not possible

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

Hide file tree

Showing 7 changed files with 11 additions and 5 deletions.
diff --git a/docs/user/docs/tools/capella/working-with-git.md b/docs/user/docs/tools/capella/working-with-git.md
@@ -30,9 +30,10 @@ Destination" opens. This shows where your work is going to be stored locally.
 
  <!-- prettier-ignore -->
 
-    !!! info
-        Tick the box: "Import all existing Eclipse projects after clone
-        finishes" importing the cloned repository into your eclipse workspace
+!!! info
+
+   Tick the box: "Import all existing Eclipse projects after clone
+   finishes" importing the cloned repository into your eclipse workspace
 
 ![Step 3: Local Destination](working-with-git/local-destination.png)
 
@@ -98,7 +99,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.
 
@@ -167,4 +168,3 @@ 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
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Copyright DB Netz AG and the capella-collab-manager contributors
+SPDX-License-Identifier: Apache-2.0
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
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Copyright DB Netz AG and the capella-collab-manager contributors
+SPDX-License-Identifier: Apache-2.0
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
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Copyright DB Netz AG and the capella-collab-manager contributors
+SPDX-License-Identifier: Apache-2.0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		SPDX-FileCopyrightText: Copyright DB Netz AG and the capella-collab-manager contributors
		SPDX-License-Identifier: Apache-2.0