Realistic rebasing examples

generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/demo1.py

@@ -0,0 +1,14 @@
+def fac(n):
+    if n == 1:
+        return 1
+    else:
+        return n*fac(n-1)
+
+def demo():
+    print("Demo")
+    print(f'fac(6) = {fac(6)}')
+
+if __name__ == '__main__':
+    demo()
+
+

generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/demo2.py

@@ -0,0 +1,15 @@
+def fac(n):
+    r = 1
+    for i in range(2, n+1):
+        print(i)
+        r *= i
+    return r
+
+def demo():
+    print("Demo")
+    print(f'fac(6) = {fac(6)}')
+
+if __name__ == '__main__':
+    demo()
+
+

generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/zusammenarbeit-rebasing-sandbox.kt

@@ -12,7 +12,22 @@ fun CollectionOfSamples.rebasingSandbox() {
             """
         ) {
             createRepo("repo-rebase") {
-                createFileAndCommit("hello") { content = "hallo welt" }
+                createFileAndCommit("hello") { content = """
+                    def fac(n):
+                        if n == 1:
+                            return 1
+                        else:
+                            return n*fac(n-1)
+
+                    def demo():
+                        print("Demo")
+                        print(f'fac(6) = {fac(6)}')
+
+                    if __name__ == '__main__':
+                        demo()
+
+                """.trimIndent()
+                }
 
                 startBranch("feature") {
                     editAndCommit("hello", "Uppercase hello") { content = "Hallo Welt" }

generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshopsamples.kt

@@ -48,6 +48,7 @@ fun buildGitUebungen() {
         }
 
         thema("Weihnachten") {
+            rebasingSandbox()
             gitmas()
         }
      }

generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshopsandbox.kt

@@ -11,9 +11,9 @@ fun main() {
         thema("beispiel") {
 
             // halloWelt()
-            // rebasingSandbox()
+            rebasingSandbox()
             //repositoryUntersuchen()
-            reverting()
+            // reverting()
             // commitsErstellen()
             // staging()
             // cloning()