Goals

• Avoid unsafe operations (e.g., git rebase).
• Introduce some additional best practices (e.g., git commit -v; checking what files will be committed before committing, and modifying .gitignore if it's wrong.).
• Reduce the number of different commands required to learn, but possibly require more commands to be issued (e.g., git branch feature; git checkout feature instead of git checkout -b feature; it might seem like the latter is easier, but then you must know the purpose of -b, and when to leave it off).
• Rely on more external resources for instructions and provide more links to other resources.

What's changed

• Rebasing and squashing have been removed.
• Commands have been simplified and normalized avoiding one-off forms/commands whenever reasonable.
• Added guides for each role.
• Added reflection points in the activity. These are good places for facilitators to discuss each section and synchronize there class.
• Issues and the issue tracker have been integrated into the workflow.
• The presentation has been improved in several ways
  • The orientation of the repositories now match GitHub's right-to-left flow in pull-request creation (base <- source).
  • Screenshots show where and how commands are being performed.
  • Screenshots demonstrate how to tell if one is looking at a fork or the upstream repository on GItHub.
  • Screenshots demonstrate where to get the correct URL for cloning and remotes.
• Many other issues that folks have identified have been addressed. See below.

Issues

• Closes #25 because they are now asked to add a license
• Closes #22 because reflection subsections are added to each section
• Closes #21 because there are now different guides for different roles
• Closes #24 because <MY_URL> and <THEIR_URL> are gone; although folks could still get confused by all caps placeholders even though they are explained at the beginning of the guide.
• Closes #18 because no paths are given
• Closes #20 because I gave a new guess to the time requirements.
• Closes #23 because there are now each section ends with reflection questions which are times for group discussions.
• Closes #31
• Closes #30
• Closes #29
• Closes #32
• Closes #33
• Closes #34

A team-based activity for learning a fork-branch-pull-request workflow.