Call Git cmd_main directly

2026-06-24 13:16:35 -05:00
parent a9d7b0cfc0
commit 0554c736e4
26 changed files with 1141 additions and 661 deletions
--- a/app/src/main/java/solutions/tretter/githugandroid/levels/MergeLevel.kt
+++ b/app/src/main/java/solutions/tretter/githugandroid/levels/MergeLevel.kt
@@ -26,7 +26,6 @@ internal fun mergeLevel(): Level = level(
    },
    validator = repoPredicate { repo ->
        repo.headBranch == "master" &&
-            "merge" in repo.maintenanceActions &&
            repo.files.any { it.name == "file2" && it.tracked }
    },
    testCases = listOf(