We also have a lesson that teaches branches and PRs that we use in our local workshops.
https://uw-madison-datascience.github.io/git-novice-custom/ Let me know if you have any questions or suggestions! Best, Sarah On Jul 24, 2019, at 17:09, Bennett E.J. <e.j.benn...@swansea.ac.uk<mailto:e.j.benn...@swansea.ac.uk>> wrote: Hi Sumana A colleague has written https://m4rkd.github.io/git-beyond-the-basics/, which is intended to provide a “what next” for the SWC git lesson, covers branching and was initially going to cover PRs, but they got crowded out by more git-specific material. The issue at https://github.com/M4rkD/git-beyond-the-basics/issues/21 mentions adding them. Best Ed Sent from my iPhone On 24 Jul 2019, at 22:54, Sumana Harihareswara <s...@changeset.nyc<mailto:s...@changeset.nyc>> wrote: I'm training a new contractor on basic shell and git, and the Software Carpentry materials have been FANTASTIC. But I would like to teach her about branching and pull requests next. I recognize and understand that the git novice lesson doesn't cover branching and I totally get why https://swcarpentry.github.io/git-novice/guide/index.html . I would like to continue with a Carpentry-style approach that uses live coding, frequent formative assessment (including exercises with solutions), making mistakes and working through them, incremental diagram presentation, and so on, as in http://third-bit.com/2019/06/15/10-quick-tips-for-delivering-a-programming-lesson.html . Is anyone aware of such a lesson, covering branches and GitHub pull requests? Or is anyone working on one? I'm aware of some resources but haven't found anything that is quite what I am looking for: * https://learngitbranching.js.org/ * https://github.com/lexnederbragt/github_collab_workshop/blob/master/workshop_outline.md * https://github.com/dlab-berkeley/git-fundamentals and in particular https://github.com/dlab-berkeley/git-fundamentals/blob/master/pdfs/0-7_branching.pdf I don't want to reinvent the wheel, and I'd like to use/test/contribute to such a lesson if it exists. Thanks, Sumana Harihareswara The Carpentries<https://carpentries.topicbox.com/latest> / discuss / see discussions<https://carpentries.topicbox.com/groups/discuss> + participants<https://carpentries.topicbox.com/groups/discuss/members> + delivery options<https://carpentries.topicbox.com/groups/discuss/subscription> Permalink<https://carpentries.topicbox.com/groups/discuss/T88a5a6f29942ba00-Maeba20d6d3c6a692905e2028> ------------------------------------------ The Carpentries: discuss Permalink: https://carpentries.topicbox.com/groups/discuss/T88a5a6f29942ba00-M64472e8e6451d082a29186e6 Delivery options: https://carpentries.topicbox.com/groups/discuss/subscription
