Hi Inigo, We have a variation we teach that teaches branches and PRs (and conflicts in branches instead of using remotes in github) that we teach locally.
https://uw-madison-datascience.github.io/git-novice-custom/ Hopefully soon I’ll see about moving it into the incubator. I have some instructor notes that aren’t yet in the instructor notes so let me know if you do want to teach it. I do find it takes a bit longer. In person, I’ve been able to get them to making a PR (though not updating it). This takes longer online. I think on average our instructors usually get through Conflicts or Remotes in Github in the 3.5 hrs (with two 10-min breaks) we have usually scheduled. Let me know what your questions are! Best, Sarah Sarah Stevens, PhD (she/her/hers) - Data Science Facilitator Data Science Hub<http://datascience.wisc.edu/>,University of Wisconsin - Madison<http://www.wisc.edu/> email: [email protected]<mailto:[email protected]> // office: 1156 Discovery Building From: Colin Sauze <[email protected]> Date: Monday, March 15, 2021 at 9:40 AM To: [email protected] <[email protected]> Subject: Re: [cp-discuss] Advices on instructing Git lesson online I found that working in pairs didn't always work well if the pair weren't of similar ability or that sometimes they'd claim to have completed the exercise when they hadn't. Instead i've tried a few times getting the whole class to collaborate on the same repository. I usually do this in two parts. First I get them all collaborating on the same repository, get them each to make a change to it and then I go through the process of dealing with merge conflicts as a live coding event. This usually results in chaos, people end up overwriting each other's contributions and having to resolve merge conflicts. But it illustrates really well why we don't always want lots of collaborators on the same project. It also means you can confirm that everybody has completed the exercise. Having a helper and the instructor do this first as a demonstration helps a bit, but there will still be chaos. Then I repeat the exercise using pull requests, where they each submit a pull request and then its entirely up to the repo owner (the instructor) to resolve the conflicts. I found this worked well with small groups (5-10) and I remember getting sticky note feedback once saying "now I feel like I really know how to use git". But that was at an in person workshop. Last year I tried it with a larger group (about 20) and online. The conflicts caused some to think they'd done something wrong. In the feedback some of them said that more of a warning that there would be errors would have been useful. If I was going to do it again I think i'd split them into several small groups of about 5 people. If doing it online I'd put each sub-group into a breakout room with a helper and have them work on their own repository for the room. A helper or volunteer from each group could then merge these back into the instructor's repository. Colin. On 10/03/2021 17:34, Inigo Aldazabal Mensa wrote: > [RHYBUDD! E-BOST ALLANOL / CAUTION! EXTERNAL E-MAIL] > > > Hi all, > > Next week I'll be instructing my first online workshop, specifically > the Git lesson. > > I have instructed this lesson quite a few times in person, and starting > from the collaboration part I do learners work in pairs, with one being > the repository "owner", and the other the "collaborator", swapping > roles, creating and resolving conflicts, etc. This usually takes the > second half of the lesson. > > Now the questions is, how do you deal with working in owner - > collaborator pairs in an online workshop? You don't work in pairs > and just demo this part? Do you pair your learners somehow? Any tips or > ideas will be very welcome. > > Bests, > > Iñigo > > -- > Iñigo Aldazabal Mensa, Ph.D. > HPC Computing Centre Manager / Scientific Computing Specialist > Centro de Física de Materiales (CSIC-UPV/EHU) > Paseo Manuel de Lardizabal, 5 > 20018 San Sebastian - Guipuzcoa > SPAIN > > phone: +34-943-01-8780 > e-mail: [email protected] [email protected] > pgp key id: 0xDBCC8369 > > > ------------------------------------------ > This list is for the purpose of general discussion about The Carpentries > including community activities, upcoming events, and announcements. Some > other lists you may also be interested in include discuss-hpc, discuss-r, and > our local groups. Visit > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcarpentries.topicbox.com%2Fgroups%2F&data=04%7C01%7C%7C885c5e1080d34b8e701a08d8e789e7ee%7Cd47b090e3f5a4ca084d09f89d269f175%7C0%7C0%7C637513926787261964%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=xSESNsLSgc2UX8JGieHVYQf0TSSM%2F9SQTBcouVnQbEk%3D&reserved=0 > to learn more. All activity on this and other Carpentries spaces should > abide by The Carpentries Code of Conduct found here: > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdocs.carpentries.org%2Ftopic_folders%2Fpolicies%2Fcode-of-conduct.html&data=04%7C01%7C%7C885c5e1080d34b8e701a08d8e789e7ee%7Cd47b090e3f5a4ca084d09f89d269f175%7C0%7C0%7C637513926787261964%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=xRQLfToJc%2FzxrKewSb9H1YJeiEkl5npjfZWvDdtzcCo%3D&reserved=0 > > The Carpentries: discuss > Permalink: > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcarpentries.topicbox.com%2Fgroups%2Fdiscuss%2FT2146428157a4d784-Mb0b59b605ccddc965bab553c&data=04%7C01%7C%7C885c5e1080d34b8e701a08d8e789e7ee%7Cd47b090e3f5a4ca084d09f89d269f175%7C0%7C0%7C637513926787271953%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=VmGOc5UDkluvqOrA%2BisnLn2hUubKCE4rPQN4nzAcrpA%3D&reserved=0 > Delivery options: > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcarpentries.topicbox.com%2Fgroups%2Fdiscuss%2Fsubscription&data=04%7C01%7C%7C885c5e1080d34b8e701a08d8e789e7ee%7Cd47b090e3f5a4ca084d09f89d269f175%7C0%7C0%7C637513926787271953%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=Jbc9q3KyeDhWtTDpCDRDfHT%2B%2B698kwIYzkxkia%2BvKJE%3D&reserved=0 -- Dr. Colin Sauze Research Software Engineer Supercomputing Wales Project Room 2.16, Physical Sciences Building Aberystwyth University, Penglais, Aberystwyth Ceredigion, UK, SY23 3DB Tel: +44 (0)1970 622774 Webpage: http://users.aber.ac.uk/cos ---------------------------------------------------------------------------------------------------------------------- Y Brifysgol orau yn y DU am Ansawdd ei Dysgu a Phrofiad Myfyrwyr Best University in the UK for Teaching Quality and Student Experience (The Times and Sunday Times, Good University Guide 2021) Rydym yn croesawu gohebiaeth yn Gymraeg a Saesneg. Cewch ateb Cymraeg i bob gohebiaeth Gymraeg ac ateb Saesneg i bob gohebiaeth Saesneg. Ni fydd gohebu yn Gymraeg yn arwain at oedi. We welcome correspondence in Welsh and English. Correspondence received in Welsh will be answered in Welsh and correspondence in English will be answered in English. Corresponding in Welsh will not involve any delay. ------------------------------------------ This list is for the purpose of general discussion about The Carpentries including community activities, upcoming events, and announcements. Some other lists you may also be interested in include discuss-hpc, discuss-r, and our local groups. Visit https://carpentries.topicbox.com/groups/ to learn more. All activity on this and other Carpentries spaces should abide by The Carpentries Code of Conduct found here: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html The Carpentries: discuss Permalink: https://carpentries.topicbox.com/groups/discuss/T2146428157a4d784-Md6d221c72a6a4d66adcb1e40 Delivery options: https://carpentries.topicbox.com/groups/discuss/subscription
