Misc Changes

app/src/main/java/solutions/tretter/githugandroid/levels/MergeSquashLevel.kt

@@ -0,0 +1,21 @@
+package solutions.tretter.githugandroid
+
+/**
+ * Port of the upstream ruby-githug `merge_squash` level.
+ *
+ * Setup documents the repository shape the learner explores. Evaluation is kept
+ * state-based whenever the exercise changes repository objects; answer-only
+ * levels intentionally validate the answer entered at the prompt.
+ */
+internal fun mergeSquashLevel(): Level = level(
+    id = "merge_squash",
+    title = "Merge Squash",
+    description = "Merge all commits from the long-feature-branch as a single commit.",
+    hints = listOf("Take a look at the `--squash` option of the merge command. Don't forget to commit the merge!"),
+    commandSuggestions = listOf("git merge --squash long-feature-branch", "git commit -m \"Merge long feature\""),
+    setup = { RepoState(initialized = true, files = listOf(GitFile("file1", tracked = true)), branches = mapOf("master" to 2, "long-feature-branch" to 4)) },
+    validator = repoPredicate { repo -> "merge-squash" in repo.maintenanceActions && repo.commits.isNotEmpty() },
+    testCases = listOf(
+        levelTestCase("squash merge then commit", "git merge --squash long-feature-branch", "git commit -m \"Merge long feature\""),
+    ),
+)