ubung2

.idea/workspace.xml

@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="ff19f7bd-a249-4c52-a218-56cff65ae900" name="Changes" comment="" />
+    <list default="true" id="ff19f7bd-a249-4c52-a218-56cff65ae900" name="Changes" comment="ubung2">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="ubung2" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="MarkdownSettingsMigration">
@@ -15,6 +22,7 @@
   </component>
   <component name="ProjectId" id="2HHFeY5bI6fMzhtOc4ian5jmKFb" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <OptionsSetting value="false" id="Update" />
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectViewState">
@@ -42,7 +50,27 @@
       <updated>1667934200578</updated>
       <workItem from="1667934207156" duration="1466000" />
       <workItem from="1667935721702" duration="73000" />
+      <workItem from="1667935938145" duration="1995000" />
+      <workItem from="1667978641231" duration="1543000" />
+      <workItem from="1667980824243" duration="1298000" />
+      <workItem from="1667983119468" duration="302000" />
+      <workItem from="1667983506078" duration="991000" />
+    </task>
+    <task id="LOCAL-00001" summary="merge conflicts">
+      <created>1667935991746</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1667935991746</updated>
+    </task>
+    <task id="LOCAL-00002" summary="ubung2">
+      <created>1667984194096</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1667984194096</updated>
     </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -61,5 +89,8 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+    <MESSAGE value="merge conflicts" />
+    <MESSAGE value="ubung2" />
+    <option name="LAST_COMMIT_MESSAGE" value="ubung2" />
   </component>
 </project>

Lerntagbuch.md

@@ -11,3 +11,12 @@ ich lerne git
 - created a ssh key.
 - added public key to gitLab.
 - created Branch.
+
+### übung 2: 2.11.2022
+- created a branch übung2
+- created file Programmierparadigm
+- added my analysis for different languages
+- commit and pushed the Branch.
+- created Merge request for the Branch to merge in main  Branch
+- merged the Branch.
+