Hi Matt,
Thanks for this - do you have a feeling for what goes wrong at various
steps? I.e., how often do they go back into their first directory and
wonder why they can't pull from it into itself (I've done that), or how
often do they have trouble getting the path right when doing the 'git
clone'?
Thanks,
Greg
On 2015-01-15 6:22 PM, Matthew Gidden wrote:
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
--
Dr. Greg Wilson | [email protected]
Software Carpentry | http://software-carpentry.org
_______________________________________________
Discuss mailing list
[email protected]
http://lists.software-carpentry.org/mailman/listinfo/discuss_lists.software-carpentry.org
