Day 2: Branching, Merging and collaboration workflows
September 28, 2025
Let’s check if we are all set with the teams.
Basic Git workflow:
Basic Git workflow:
Git is a distributed version control system
In Git language, this is called cloning
In Git language, this is called cloning
You can clone
All you need is the URL of the remote repository
Clone your team mate’s cook Book repo
Details in Task 2 “Clone”
git push
git pull
This works well if
Get the changes of your team mate from the remote.
This workflow starts to be problematic when
Advantages of this approach
The steps to create and work on a separate branch are easy:
To bring changes to the main branch you need to merge them.
Git merge brings the commits from the branch to main
To bring changes to the main branch you need to merge them.
If there was a commit in main, a merge commit is introduced.
To bring changes to the main branch you need to merge them.
If there was a commit in main, a merge commit is introduced.
Create a branch and merge it in your team mate’s cook book
Complete task 2 “Branch and merge”
A pull request is basically asking your collaborators:
What do you think of my changes? Can we integrate them in main or do we still need to change something?
GitHub has nice features for pull requests, e.g.:
A pull request is merged on GitHub when everyone agreed on the code.
Create a pull request on your team mate’s repo
Complete task 3 “Pull requests”
.gitignore
Some essentials that will improve your published repository:
If you are interested, browse some nice GitHub repositories for inspiration (e.g. Computational notebooks guide)
Check out the resources page and the different How-tos for more info and practice.
Questions?
Branching, Merging and Collaboration with Git