Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.Sign up
Workflow clarity in Collaborating and Conflicts #609
The end of 8 - Collaborating includes a "Basic Collaborative Workflow". A visual representation of this that connects the actions and commands to the learner's mental model (working, staging, local repo, remote) would be very helpful.
I'd suggest a variant of the diagram in 9 - Conflicts that shows an individual's basic workflow. The diagram in Conflicts can then be updated to have order (i.e. a conflict is a race condition - both pull, both edit, one pushes before the other) and make it clear what is impacted at each step (local repos, working copies, or remote).
Similarly, when the workflow is referenced again with respect to minimizing conflicts at the end of lesson 9, there should be a clear distinction between individual workflow best practices vs. common group practices -- all of which are process/project management related (the lesson refers to the individual workflow practices as "technical approaches").