gitEASYGIT WORKFLOW
Warm up with conflict resolution drill diagnostic drill
Easy Git arena: merge conflicts, intent preservation, and verification
XP reward
140
Coins
12
Target time
42m
A learner is about to attempt the full conflict resolution drill arena. Build a smaller but realistic diagnostic that exposes whether they understand merge conflicts, intent preservation, and verification. You are working inside a collaborative Git repository, and the arena only clears when the result is safe, deterministic, and explainable.
Learning objective
Learn to apply merge conflicts, intent preservation, and verification in a collaborative Git repository while explaining the invariant, safety constraints, and hidden edge cases.
Mission order
Conflict markers appear in validator.ts and tests describe both intended behaviors. Include one normal case, one malformed case, and one ordering or safety edge case. Implement the direct solution first, then document the one edge case that can break it. Submit the solution plus enough reasoning to pass hidden edge cases.Visible checks
uses safe command composition
Expected: deterministic command sequence
handles ordinary filenames
Expected: stable output
Clear requirements
- Demonstrates merge conflicts, intent preservation, and verification
- Handles the visible sample and hidden edge cases
- Keeps output deterministic and explainable
- Avoids unsafe dynamic execution
Secure validation contract
Judge type
GIT WORKFLOW
Complexity target
Command sequence preserves work, history intent, and verification signal
Git final state
Repository state demonstrates merge conflicts, intent preservation, and verification and includes verification notes.
Workspace
Terminal lab
Simulated secure terminalhost isolated
Test Results
Run the visible checks when your first pass is ready.
Clear Protocol
1Read the scenario and restate the expected output shape.
2Run visible checks before chasing hidden edge cases.
3Use Genie for one nudge if stuck, then explain the invariant.
4Submit only when the result is deterministic and safe.
Rewards
XP
140
Coins
12
Mission Route
Hints
Hints are metered and logged for No Hint Hero runs.
Genie Mentor Core
Hint protocol / contextual guardrails active
Progressive hints
Failed-test aware
Solution guarded
Mission: git-easy-conflict-resolution-diagnostic0 attempts0 failed tests0 hints used
Progressive hint depth
Genie: Genie online. I use your mission, attempts, failed tests, hints, and path context to coach the next rep without dumping answers first.