Implement hands-on T6L2/hp-merge-ff

hands_on/merge_ff.py

@@ -0,0 +1,52 @@
+import os
+
+from exercise_utils.file import create_or_update_file, append_to_file
+from exercise_utils.git import add, commit, init, checkout
+
+__requires_git__ = True
+__requires_github__ = False
+
+
+def download(verbose: bool):
+    os.makedirs("sports")
+    os.chdir("sports")
+
+    init(verbose)
+
+    create_or_update_file(
+        "golf.txt",
+        """
+        Arnold Palmer
+        Tiger Woods
+        """,
+    )
+    add(["golf.txt"], verbose)
+    commit("Add golf.txt", verbose)
+
+    create_or_update_file(
+        "tennis.txt",
+        """
+        Pete Sampras
+        Roger Federer
+        Serena Williams
+        """,
+    )
+    add(["tennis.txt"], verbose)
+    commit("Add tennis.txt", verbose)
+
+    checkout("add-swimming", True, verbose)
+
+    create_or_update_file(
+        "swimming.txt",
+        """
+        Michael Phelps
+        """,
+    )
+    add(["swimming.txt"], verbose)
+    commit("Add swimming.txt", verbose)
+
+    append_to_file("swimming.txt", "Ian Thorpe")
+    add(["swimming.txt"], verbose)
+    commit("Add Thorpe to swimming.txt", verbose)
+
+    checkout("main", False, verbose)