ucsdlib / git-novice

Software Carpentry introduction to Git for novices.
http://ucsdlib.github.io/git-novice/
Other
4 stars 3 forks source link

discuss: make file changes during branching not merging? #65

Closed chrissyrissmeyer closed 7 years ago

chrissyrissmeyer commented 7 years ago

Should we have participants make the changes used in merging during branching?

mcritchlow commented 7 years ago

I defer to @dunn , though I think that could potentially work nicely. Ties the two section together, 'full clrcle', and all that.

dunn commented 7 years ago

I think we should combine them into a single section.

chrissyrissmeyer commented 7 years ago

https://github.com/ucsdlib/git-novice/pull/78