Git Branching and Merging
Lesson notes
Overview
Branches let developers work in parallel and merge changes later. This topic is rated intermediate and is number 100 of 117 in Computer Science. Builds on the basics with relationships, methods and trade-offs.
What you are seeing
The panel above shows the steps of a process, laid out in order. Click a step to see what happens next. The animation is drawn live from the model, so everything you see responds to the sliders. Press Space to pause, use Restart to replay from the start, and change the speed to slow down quick events.
In depth
Git stores history as a graph of commits, and a branch is just a movable pointer to one. Developers create branches to work on features in parallel without disturbing the main line, and later merge them. If changes overlap, a merge conflict must be resolved by hand. Rebasing replays commits on top of another branch to keep a linear history. Cheap branching makes experimentation and code review workflows easy.
Reading the relationship
The expression "commit graph" is a compact summary of the idea. It uses the symbols c, o, m, i, t, g; name what each one stands for before you start. Then use the sliders to see how changing one quantity changes the others.
A guided exploration
1. Run the animation once with the default settings and describe in words what happens. 2. Change one slider at a time and note which quantity responds most. 3. Push each slider to its extreme and decide whether the result still makes sense.
Try this
Predict the outcome first, then test extreme slider values to find where the pattern changes or breaks.
Common pitfalls
Test small inputs by hand and then the largest ones. Off-by-one errors and forgetting how cost grows with input size are the most common traps.
How it connects
It builds on “Public-Key Infrastructure”, the topic before it in Computer Science. Once you are comfortable, continue with “Continuous Integration”.
Why it matters
Computing ideas decide how fast, how safely and how well software can solve problems.
Where you might use it
- Revising “Git Branching and Merging” before a class, exam or certification
- Choosing the right algorithm or data structure when writing software or apps
- Debugging programs and judging how fast or how safely code will run at scale
- Understanding how search engines, games, phones and AI systems make decisions
Frequently asked questions
What is Git Branching and Merging?
Branches let developers work in parallel and merge changes later. It is an intermediate topic in Computer Science.
How do I use the Git Branching and Merging simulation?
The panel at the top shows the steps of a process, laid out in order. Click a step to see what happens next. Move the sliders one at a time, then press Space to pause the animation and look closer.
What does the formula mean?
The expression commit graph packs the idea into symbols. Name each symbol first, then change one quantity with the sliders and see which others respond.
Who is this topic for?
Builds on the basics with relationships, methods and trade-offs. If the quiz feels hard, reread the lesson notes and try the previous topic first.
What should I learn before this?
Start with “Public-Key Infrastructure”, the previous topic in Computer Science. Each topic in a subject builds on the ones before it.
How do I track my progress?
Press “Mark as learned” on this page. Progress is stored only in this browser and is never sent anywhere. The Browse page can show topics you have learned or still need to learn.