Here is a webinar version of the way I teach git. I created this a couple of year back after I assisted in a SC git session and noticed how hard people where getting overloaded keeping track of all the commands and what they did.
The idea behind it is to build up a single diagram that shows what the commands are and what they do through examples so there is no memory overload. I've had a lot of positive feedback about it. It gets to branching and merging at the end https://www.youtube.com/watch?v=meFv-GDTkjE The second part continues focuses on the online collaborative portion of using git (in this case gitlab as that is what we provide to our HPC users, but github is essentially the same) https://www.youtube.com/watch?v=i9iG5u36XIY In an actual software carpentry situation I get them to do several of the parts as exercises in the standard SC way. Cheers! -Tyson On Wed, 24 Jul 2019 at 17:55, Sumana Harihareswara <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 / discuss / see discussions + participants + delivery options > Permalink ------------------------------------------ The Carpentries: discuss Permalink: https://carpentries.topicbox.com/groups/discuss/T88a5a6f29942ba00-M5d6dfc648fbc7867d750767c Delivery options: https://carpentries.topicbox.com/groups/discuss/subscription
