Module 2 Exercise 2: Recreate Your Assignment Workflow


(Daniel Goldsmith) #29

Branch for each of the different assignment tasks,
Merge back into final report


(Rishabh Bansal) #30

Hi @mozzadrella! This is my Module 2 Exercise 2.3 Submission! :slight_smile:


(Miren Berasategi) #31

We haven’t actually done this yet, but this is how I imagine students working on a simple website, adding content first, then creating layout elements, and styling it all in the end.


(Derek Land) #32

No real workflow here yet. Playing around to understand the basics and get a feeling of what it can contribute to classroom activities in a non-programmers department.


(Vanessa) #33

This is so cool!

You can delete the branch, or, as you get more comfortable, cherry pick the commits you want to move:

https://git-scm.com/docs/git-cherry-pick

There are more advanced workflows for this, including reset hard and rebase. There’s documentation on those commands if you’d like to find out more:

https://help.github.com/articles/about-git-rebase/


(Vanessa) #34

Hi @nasseef, does this belong in Module 2 Exercise 3: Wikipedia Switcheroo?


(Vanessa) #35

@MrODonnell the :sparkle: of branches is that, 99% of the time, we’re on a branch, so we’re almost always using them.

I’ve seen teachers use different branches for different class periods (@gcschmit) , or for pieces of an individual project that build upon each other (I believe it was @ericboivin).

I like using that second :bulb: for your code sample project.


(Vanessa) #36

@OmalPerera here’s a diagram of a real-world workflow…might you want to include a development branch in addition to features?

U5dsWXZMaAktAMPQkRWDbmBZVqpmtFU_1680x8400


(JuanMa) #37


(Evan Misshula) #38


Here is my assignment flow


(Elias Nogueira) #39


(Vanessa) #40

Hi @EvanMisshula when do your students merge back to master?


(Vanessa) #41

Hi @eliasnogueira what’s going on in your assignment workflow? Do assignments2 and assignments3 merge back into the master branch at some point?


(Vanessa) #42

Nice :100: :tada:


(Evan Misshula) #43

Honestly, I am working through this to prep using this for real. So, it has not really happened yet. I would have them merge back after they get a feature working.


(Mike Zamansky) #44

Was just showing the kids last week how to have individual branches for assignments:


(César Olivares) #45

For this exercise, I expect each student to work individually starting from provided assignment.


(Paola Corrales) #46

I’m not teaching at this moment. I start in a few weeks and i have to convince the head teachers to star to use git hub :sweat_smile:
In the mean time I learning how to implement this in a class. So, I invented a thing to do this exercise:


(Carles Alonso Martinez) #47

This is an individual assignment.
Assignment consists to implement a console application in C#
Starter code will be provided by teacher (first commit)
Student can develop features with branchs (work for mandatory work) and improves for introducing additional features and merge to master to present the work.


(42bbennett) #48