search

diy / opensourcerer.diy.org

A DIY Guide to Git, GitHub and open source collaboration!
opensourcerer.diy.org
Other
14 stars 14 forks source link

Show an example of merging changes? #3

Closed ajb closed 11 years ago

ajb commented 11 years ago

Yo, this guide is awesome!

When I first saw this illustration:

I thought that it would show a merge -- i.e. Sam adds peacock feathers before Jean pushes her tiger head commit. Is this something that should be included somewhere in the guide, or is it too complicated/not in the scope?

jlord commented 11 years ago

Thanks!

Yeah - we decided for this graphic to keep it simple and keep it in the scope of "make things better, together." It also doesn't address that the users forking this imaginary repo are also able to push without having been given access to the repo they've forked from...

The guide doesn't cover merges at all because we just have the users submit pull requests to our repo. This is the starting point - we would totally love for the kids on the site to do these challenges and then say "we want more!" and then we'll add round 2 and dive more into things like merging, branches and so on.