Browse Source

Update UebungSCM.md

remotes/origin/HEAD
fdai7723 1 year ago
parent
commit
a1dff09da7
  1. 39
      UebungSCM.md

39
UebungSCM.md

@ -178,14 +178,15 @@
> Revert "SCM"
>
> This reverts commit 4bcb7c56d9dcf9e06223188c52c5d9b6f5a9030d.
>
> # Please enter the commit message for your changes. Lines starting
> # with '#' will be ignored, and an empty message aborts the commit.
> #
> # On branch master
> # Changes to be committed:
> # deleted: SCM.txt
> #
> Please enter the commit message for your changes. Lines starting
> with '#' will be ignored, and an empty message aborts the commit.
>
> On branch master
> Changes to be committed:
> deleted: SCM.txt
>
### Ausgabe 2
@ -381,25 +382,25 @@ committen oder zur Stash hinzufügen, sonst bricht Git den Versuch, den Branch z
> Author: HV <123>
> Date: Sun Nov 19 17:16:37 2023 +0100
>
> test1Commit1
> test1Commit1
>
> commit 9380ec4ee992866ca2a06af022d665eed8918ab0
> Author: HV <123>
> Date: Sun Nov 19 17:16:15 2023 +0100
>
> test1Commit1
> test1Commit1
>
> commit 74660af0098e5ea03e23dc3b611deb26ef6022a4 (master)
> Author: HV <123>
> Date: Sun Nov 19 17:12:40 2023 +0100
>
> testSCM hinzugefuegt
> testSCM hinzugefuegt
>
> commit 93adc2aaf180b9e8d7f143d81e460d8692bb2aaa
> Author: HV <123>
> Date: Sun Nov 19 17:09:48 2023 +0100
>
> main2
> main2
>
### 3. Informationen über den commit
@ -412,7 +413,7 @@ committen oder zur Stash hinzufügen, sonst bricht Git den Versuch, den Branch z
> Author: HV <123>
> Date: Sun Nov 19 17:16:37 2023 +0100
>
> test1Commit1
> test1Commit1
### 5. Vereinfachte Historie
@ -615,12 +616,12 @@ committen oder zur Stash hinzufügen, sonst bricht Git den Versuch, den Branch z
### 11. Vergleichen ( Die Zeile "=======" wird nicht mehr angezeigt)
> ...
> ...
> ...
> <<<<<<< HEAD
> ...
> ...
> ...
> ...
> ...
> <<<<<<< HEAD
> ...
> ...
## Merging - Konfliktauflösung und Vorbereitung

Loading…
Cancel
Save