Apply branches¶
Branching structure of an earlier course iteration.
Learning objectives
- create, switch and delete a
git
branch
For teachers
Teaching goals are:
- Learners have create, switch and delete a
git
branch
gantt
title Lesson plan apply branches
dateFormat X
axisFormat %s
Introduction: intro, 0, 5s
Theory 1: theory_1, after intro, 5s
Exercise 1: crit, exercise_1, after theory_1, 25s
Feedback 1: feedback_1, after exercise_1, 10s
Prior questions:
- What is a branch?
- What is the problem that branches alleviate?
- What is the name/names of the most important branch?
- What is our git branching setup?
- What is the goal of that setup?
- Why do we use that setup instead of a different one?
- What is the purpose of each of those branches?
- Does creating a branch create a new version? Why?
- Does changing a branch change the content of your local computer? Why?
- Does deleting a branch create a new version? Why?
Exercises¶
Exercise 1: create, switch and delete a git
branch¶
Learning objectives
- Create, switch and delete a
git
branch - Build up experience using git without troubleshooting
gitGraph
commit id: "Before start"
commit id: "Branching version"
branch sven
checkout sven
commit id: "Modify my file"
commit id: "Delete branch" type: HIGHLIGHT
checkout main
commit id: "Another commit"
- For our shared GitHub repository, create a branch with your first name that is
unique, e.g.
sven
,sven_svensson
orsven_svensson_314
. You may branch of frommain
ordevelop
(if it exists). You may use the web interface (easiest!) or use the command line - On your local computer:
- update the repository
- switch to the new branch
- change the content of the repository, for example,
by creating a file in
learners/[your_name]/[your_name]_is_on_[your_branch_name]
- push your changes online.
- On GitHub, verify that your changes on your branch can be found online
- On your local computer, switch to the main branch, as we'll delete the branch you are on now
- Delete your branch (i.e. the one with the unique name). You may use the web interface (easiest!) or use the command line
- On your local computer, update your code
Answers
- For our shared GitHub repository, create a branch with your first name that is unique, e.g.
sven
,sven_svensson
orsven_svensson_314
. You may branch of frommain
ordevelop
(if it exists). You may use the web interface (easiest!) or use the command line
Click on 1, type your branch name at 2 (in this case, richel
), then click 3.
Done!
- On your local computer:
- update the repository
On your local computer, navigate to the folder of the shared project and update:
- On your local computer:
- switch to the new branch
Switch to the new branch, for example, richel
, by doing:
- On your local computer:
- change the content of the repository, for example, by creating a file in
learners/[your_name]/[your_name]_is_on_[your_branch_name]
This can be any change you'd like. To create a file under Linux (and maybe this works on other operating systems too), one can do:
After the change, commit these:
- On your local computer:
- push your changes online.
Do:
And your code may end up online.
If that does not work, do:
and try pushing again, maybe multiple times, as many people are pushing to the shared repo.
- On GitHub, verify that your changes on your branch can be found online
Make sure you look at the correct branch, as displayed at 1. Then your commit message shows up at 2.
- On your local computer, switch to the main branch, as we'll delete the branch you are on now
Switch to the main branch, for example, main
, by doing:
- Delete your branch (i.e. the one with the unique name). You may use the web interface (easiest!) or use the command line
Click on 'Branches', as shown in the image above.
Click on garbage bin, as shown in the image above.
The branch will now be deleted, as shown in the image above.
- On your local computer, update your code
Do:
Need a video?
See a video here