I’ve got an IT Pro-oriented variation on Steve Bond (Biologyguy)’s variation on Git – Steve’s variation uses “notes on functions to program” in place of the Dracula examples, and my variation adds in things like labels, tags, branches, and different ways to undo and follow different paths.
Here’s the starting point at which it significantly diverges from the standard lesson set: https://dlstrong.github.io/git-novice/05-label-and-undo/ From there the next few lessons go through some of the standard stuff in a different order, and then we get to pull requests in: https://dlstrong.github.io/git-novice/08-pull-request/ I’ve only taught “label and undo” once so far and it was to an IT Pro audience, so I can’t vouch for its compatibility with the more usual Carpentries audience, but it’s there for raiding if you’d like it. From: Sumana Harihareswara <s...@changeset.nyc> Sent: Wednesday, July 24, 2019 4:54 PM To: discuss <discuss@lists.carpentries.org> Subject: [discuss] Carpentry-style lesson that covers git branching? 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-M19567f13922bb1127746e990> ------------------------------------------ The Carpentries: discuss Permalink: https://carpentries.topicbox.com/groups/discuss/T88a5a6f29942ba00-M0a05670209c6012f45b0d35b Delivery options: https://carpentries.topicbox.com/groups/discuss/subscription
