Skip to content

Latest commit

 

History

History
17 lines (15 loc) · 503 Bytes

README.md

File metadata and controls

17 lines (15 loc) · 503 Bytes

physical-git-game

An experimental silly game for studying git with silly poses.

Play in a group with a sense of humor. Each player will be a living demonstration of a pose, corresponding to one commit of pose.md.

  1. Initial commit. Label with commit #, HEAD
  2. Change a commit in MASTER
  3. Make branch #1
  4. Merge to MASTER
  5. Make a second branch
  6. Demonstrate merge conflicts a. Automatic merge b. Manual merge
  7. Fork
  8. Pull request
  9. Discuss, new commit to fork
  10. Accept pull request