Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Exercise submission #708

Open
mjj81 opened this issue Dec 8, 2019 · 0 comments
Open

Exercise submission #708

mjj81 opened this issue Dec 8, 2019 · 0 comments

Comments

@mjj81
Copy link

@mjj81 mjj81 commented Dec 8, 2019

Greetings Carpenters,

We have been using this lesson to introduce our students to git, but also looking for a follow-up that covers other important git elements (like branching and merging for example).

Is there any plan to develop a "git-intermediate" lesson? If so, we've created a few short exercises for demonstrating understanding of particular commands (see attached example).

To see this in action, open the html file (merge.html) in a browser, and run the shell script (mergebase.sh) in a "clean" directory (i.e. one that is not already part of a git repository). The script will create a simple repository whose history matches the initial diagram on the webpage. Following the model answer's instructions should change the repository in the manner depicted in the later diagrams.

The html file shows the initial setup of the repository/repositories, then gives a short summation of the intended task (such as a demonstrator/marker might describe it to a student). The intent is that the demonstrator will run the appropriate script on the student's machine, describe the task, then observe how the student goes about solving it. Each exercise is based around one significant action (such as a merge or rebase), though it may require several operations to complete (e.g. due to dealing with merge conflicts). The task should still be such that a student who is familiar with git will be able to complete them while the demonstrator watches (but it should not be a time-based assessment - it ought to be quickly clear to the demonstrator if the student has no idea/the wrong idea how to go about solving the task).

Diagrams are created using a modified version of GitGraph.js.

Let me know if this is of any use.
Regards,
mjj81

merge_example.zip

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant
You can’t perform that action at this time.