Require real merge commit and keep level tests embedded

2026-05-19 16:18:58 -05:00
parent 5db02adbe9
commit ceb0d503f4
22 changed files with 201 additions and 93 deletions
--- a/app/src/main/java/solutions/tretter/githugandroid/levels/MergeLevel.kt
+++ b/app/src/main/java/solutions/tretter/githugandroid/levels/MergeLevel.kt
@@ -32,4 +32,7 @@ internal fun mergeLevel(): Level = level(
    testCases = listOf(
        levelTestCase("merge feature", "git merge feature"),
    ),
+    negativeTestCases = listOf(
+        levelTestCase("switching to feature does not solve", "git switch feature"),
+    ),
 )