Skip to content

v0.4.0

Choose a tag to compare

@modirniya modirniya released this 05 Oct 05:48
· 6 commits to main since this release
8dcb1dc

Pages beside the game: what Git said, line by line, and the ways out of it; a lesson for teachers, with the deck to print; a game for teams.

Added

  • Pages about Git's output, under /git (M16): the door, and the first page, ! [rejected] main -> main (non-fast-forward): what Git checked, the two hints it prints, the pull that fixes it, and why a day of the game does it to you. Every line is captured from a real Git by scripts/git-output.sh, never typed, and the page names the Git that printed it. The landing page's header links to the door.
  • Four more pages under /git: (forced update) and what --force-with-lease refuses, CONFLICT (content) and resolving it by merge, by rebase and by -X ours or -X theirs, the two spellings of nothing to do (Already up to date. and Everything up-to-date), and the three ways a pull lands: Fast-forward, Successfully rebased and Merge made.
  • The ways out, five pages under /git: someone force-pushed over my commit (and the pull --rebase that would drop it), my push was rejected, I lost a commit (a reset too far, a deleted branch, a dropped rebase, all back from the reflog), who broke main (blame, log -S, bisect run), and undoing a commit that's on main (revert, and why a reset and a push won't).
  • A page for teachers at /teach (M16d): a 45-minute lesson on 60-second days, a map from what happened in the game to what it is in Git, how to run it in a class, and the print-and-play deck, served at /print-and-play.pdf. The landing page's header links to it, and every page under /git links to it and to the next. The pages' prose and the deck are under CC BY-SA 4.0 (ADR-0010); every page's footer says so.
  • A page for teams at /teams (M16e): a game of Git inside a meeting you already have, in three lengths (fifteen minutes on 60-second days, an hour on 5-minute days, a week on 24-hour days), the runbook, three questions for the minutes after, and seven conventions each linking to its page. The landing page's header and every other page link to it.