coderefinery/git-branch-design

Git branch design lesson.

Git branch design lesson

• Credit and license

git-branch-design's Issues

demonstrate cherry-picking

add a simple cherry-picking demo to avoiding-conflicts episode

committing to wrong branch should be demostrated

use the haiku repo, erroneously commit to master branch and move that commit to new feature branch (e.g. haiku2 or senryū)

should have discussion exercise at end of branching-model episode

Learners can be instructed to discuss with their neighbour what type of branching model they use in their projects, or intend to use in future projects, or think might be useful to have in their projects

In the Git rebase , should we emphasize more on what the current branch is

For example ,
git branch -a
to make sure you are in the correct branch. Or this is already too obvious

add exercise on combining features into integration branch

e.g. add another haiku on new branch and merge them into integration branch

Change license from CC-BY-SA to CC-BY

Motivation (discussion on the Carpentries mailing list): https://carpentries.topicbox.com/groups/discuss/Td64229aeb252a027

In short, the motivation is to simplify reuse for those who wish to take parts of our lessons and remix them into material which is CC-BY.

At the team meeting 2019-08-12 we have decided to change the license to CC-BY provided that all contributors to this lesson material agree to this change.

This issue will track the progress of this change.