What I do is send a PR to a repo (usually the other instructor) so the students see what sending things look like.
At the same time I have the other instructor send me PR (usually the git repo I have been teaching). This way students see what it looks like on both ends, and I don't have to disconnect the projector. For conflicts, I usually edit something directly on github, and the same line on my local repo, and i show them why you can't push, and the conflict emerges when you do a `git pull -u origin master` On Fri, Mar 20, 2015 at 4:15 PM, Raniere Silva <[email protected]> wrote: > > We have also done this at UW in Seattle and at UBC in Vancouver using 2 > > instructors with 2 projectors. It seemed to work really well, it didn't > > take any extra time and the feedback from students was very positve. I > have > > written up a little description of what we did on the Instructor's Guide > in > > the Git lesson section (last note in the Teaching Notes section: > > http://swcarpentry.github.io/git-novice/instructors.html). > > Thanks very much for add this at teaching notes. > > _______________________________________________ > Discuss mailing list > [email protected] > > http://lists.software-carpentry.org/mailman/listinfo/discuss_lists.software-carpentry.org >
_______________________________________________ Discuss mailing list [email protected] http://lists.software-carpentry.org/mailman/listinfo/discuss_lists.software-carpentry.org
