Hi folks, Here at UW, our capstone version control module includes having students practice pull requests and merge conflicts via Github (e.g., the current bootcamp <https://github.com/UW-Madison-ACI/boot-camps/tree/2015-01-13/version-control/git/collaborate>). Getting that workflow right is non-trivial, so I wrote a short gist for practicing here <https://gist.github.com/gidden/4588a48b91855b69d63c>, and I wanted to share. It effectively mocks up an remote/local upstream with two-fork arrangement like we use in our tutorial.
Cheers, Matt -- Matthew Gidden Ph.D. Candidate, Nuclear Engineering The University of Wisconsin -- Madison Ph. 225.892.3192
_______________________________________________ Discuss mailing list [email protected] http://lists.software-carpentry.org/mailman/listinfo/discuss_lists.software-carpentry.org
