Added Branches lesson #303

wants to merge 5 commits into


None yet

2 participants


I've written a branches lesson which would ideally be used after Conflicts (or possibly after Ignore). As it's a more advanced topic. I've put it as a supplementary lesson for us to discuss and to use to demonstrate extension features of Git.

I note that this will be a controversial topic to present to absolute beginners but it would benefit many users to be exposed to this as they will be joining an existing company or institutional repoositories using branches.

TomKellyGenetics added some commits Jun 30, 2016
@TomKellyGenetics TomKellyGenetics message 385c256
@TomKellyGenetics TomKellyGenetics added lesson on branches, intended for after Conflicts or Ignoring files 972733e
@TomKellyGenetics TomKellyGenetics added warning for Git rebase 60b3bc3
@TomKellyGenetics TomKellyGenetics Update Time Estimate
I'm thinking:

* 10 minutes on creating and navigating branches or remotes.

* 10 minutes on importing commits to other branches.

* 5 minutes on pushing to GitHub with branches

With additional time for a challenge question.
@TomKellyGenetics TomKellyGenetics Compare merge with pull 4929746
@TomKellyGenetics TomKellyGenetics changed the title from Addded Branches lesson to Added Branches lesson Jul 4, 2016
iglpdc commented Jul 5, 2016

We have no time to talk about branches in this lesson, but this material could be reused for the future. Intermediate lesson.

@iglpdc iglpdc added the intermediate label Jul 5, 2016

I originally wrote this as notes for myself to demonstrate branches at the end. We realise that time is pressing and it would not be suitable for absolute beginners. Some learners at our workshop were members of our research group who we wanted to join projects using branches so this was mainly for their benefit. In the interest of time we're likely to cover this as a separate "Mozilla Study Group" session instead.

I'm happy for this to be used for an intermediate lesson.

@TomKellyGenetics TomKellyGenetics added a commit to TomKellyGenetics/swc-intermediate-git that referenced this pull request Jul 26, 2016
@TomKellyGenetics TomKellyGenetics added branches lesson as discussed swcarpentry/git-novice#306 Full hi… 25bdf15
@TomKellyGenetics TomKellyGenetics referenced this pull request in bast/DEPRECATED-swc-intermediate-git Jul 26, 2016

Branches lesson #1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment