Branches

config.yaml

@@ -66,9 +66,10 @@ episodes:
 - 04-changes.md
 - 05-history.md
 - 06-ignore.md
-- 07-github.md  
-- 08-collab-centralized.md
-- 09-collab-distributed.md
+- 07-github.md
+- 08-branches.md
+- 09-collab-centralized.md
+- 10-collab-distributed.md
 
 # Information for Learners
 learners:

episodes/08-branches.md

@@ -0,0 +1,35 @@
+---
+title: Branches
+teaching: 5
+exercises: 0
+---
+
+::::::::::::::::::::::::::::::::::::::: objectives
+
+- What are branches?
+
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+
+:::::::::::::::::::::::::::::::::::::::: questions
+
+- Understand what branches are and when to use them
+
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+::: instructor
+Explain what branches are and when to use them, we will practice with the git commands in the next episode.
+:::
+
+Have a look at 
+[these slides introducing branches](https://esciencecenter-digital-skills.github.io/digital-skills-slides/modules/git-lesson/branches).
+
+
+:::::::::::::::::::::::::::::::::::::::: keypoints
+
+- A branch represents an independent line of development.
+- Subsequent changes are considered to belong to that branch.
+
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+

episodes/08-collab-centralized.md → episodes/09-collab-centralized.md

@@ -28,8 +28,10 @@ First we show the centralized workflow all in the browser using Github:
 
 * instructor A creates an issue (for example create ‘sum’ function)
 * instructor B picks up the issue  
-* Instructor B creates a new branch (good to do this explicitly) 
+* Instructor B clones the repository
+* Instructor B creates a new branch, using `git switch -c new_feature` 
 * Instructor B does some reviewable changes (a simple ‘sum’ function) 
+* Instructor B pushes the changes to the remote repository on GitHub using `git push origin new_feature`
 * Instructor B opens a new pull request. 
 * Instructor A reviews and approves the PR. 
 * Instructor B merges the pull request. 
@@ -42,9 +44,9 @@ First we show the centralized workflow all in the browser using Github:
 #### Exercise: Working as a project collaborator (in pairs):
 - PERSON A: Create an issue in the repository
 - PERSON B: Clone this repository to your system
-- PERSON B: Create a new branch
+- PERSON B: Create a new branch, using `git switch -c new_feature`
 - PERSON B: Make the changes requested in the issue
-- PERSON B: Push the changes to the remote repository on GitHub
+- PERSON B: Push the changes to the remote repository on GitHub using `git push origin new_feature`
 - PERSON B: Submit a Pull Request, refer to the issue (e.g. "Closes #1")
 - PERSON A: Review the Pull Request
 - PERSON B: Address the comments