Misc Changes

2026-05-11 19:19:51 -05:00
parent 8f829fb969
commit 7e55084815
7 changed files with 46 additions and 9 deletions
--- a/app/src/main/java/solutions/tretter/githugandroid/levels/MergeLevel.kt
+++ b/app/src/main/java/solutions/tretter/githugandroid/levels/MergeLevel.kt
@@ -24,7 +24,11 @@ internal fun mergeLevel(): Level = level(
        checkout("master")
        true
    },
-    validator = repoPredicate { repo -> repo.files.any { it.name == "file2" && it.tracked } },
+    validator = repoPredicate { repo ->
+        repo.headBranch == "master" &&
+            "merge" in repo.maintenanceActions &&
+            repo.files.any { it.name == "file2" && it.tracked }
+    },
    testCases = listOf(
        levelTestCase("merge feature", "git merge feature"),
    ),