search

openhatch / open-source-comes-to-campus

Planning for improving Open Source Comes to Campus
30 stars 22 forks source link

Extend Practicing Git #59

Closed shaunagm closed 10 years ago

shaunagm commented 10 years ago

It should include optional further tasks/concepts. This will allow students who finish quickly to continue learning, or students who already know the basics to have an activity to do.

Concepts to potentially include: -- Merge conflicts! -- Multiple remotes. -- Reverting changes. -- Branching. -- Rebasing.

We can also consider adding a more programming-heavy element to the page. Maybe something Javascripty? It's just very text-change focused right now, and usually whoever's doing the one non-text change (the CSS) has the best time.

(I got four attendees from the advanced group at the Columbia event to agree to give us some advice about what they think such an extension should include.)

NicMcPhee commented 10 years ago

Alternatively, you could have more CSS and less text-change.

I would vote for conflicts, multiple remotes, and branching. The multiple remotes is a natural consequence of the way the forking is handled, and people in my group definitely wanted to be able to pull in the work the other people had done. Conflicts are a fact of life, and branching is a powerful piece of Good Practice, so seeing either of them would clearly be valuable.

shaunagm commented 10 years ago

The git lesson (https://openhatch.org/wiki/Open_Source_Comes_to_Campus/Practicing_Git/Students) now covers merging and remotes. I'll keep an eye on this while tackling the curriculum improvement milestone -- I think the way to deal with other concepts, for now, is to link to other tutorials that teach these concepts.