Merge! Resolve Conflicts

A fast, funny puzzle game for anyone who has ever seen <<<<<<< HEAD.

Conflict cards arrive faster than you can resolve them. Read the one-line clue, then swipe LEFT to keep HEAD, RIGHT to keep FEATURE, or UP to keep both. Finish the merge before the queue overflows or the build breaks. Kevin will push to main. He always does.

- 80 hand-written conflicts across config, API, tests, dependencies, feature flags and more

- Pick your flavour: JavaScript, Go, Python or Shell

- Combos, stability, build status, and the occasional force push

- No accounts, no ads, no tracking

Controls: swipe or drag the card, tap the buttons, or use the arrow keys (← HEAD, ↑ BOTH, → FEATURE) on desktop.

Also on the iOS App Store as "Merge! Resolve Conflicts". Not affiliated with Git or GitHub.