2.1.2 Branching & rebasing
Every entry filed under Branching & rebasing and its subtopics.
Level
What kind of help
- Guided project 1
- Explains an idea 4
- Step by step 0
- Cheat sheet 0
- Fixes an error 1
What do these mean?
- Beginner
- You are new to this topic.
- Intermediate
- You use it, and want to get better.
- Advanced
- You know it well and need the details.
- Guided project
- Build something small from start to finish, step by step.
- Explains an idea
- Plain words on how something works and why.
- Step by step
- Numbered steps to get one task done.
- Cheat sheet
- Commands and options in a table, to look up fast.
- Fixes an error
- An error message, what it means, and how to solve it.
4 entries match these filters
- 0269 What is a commit? A commit is a saved snapshot of your project in Git, with a message explaining what changed and why. Beginner · Explains an idea · Any system Article Branching & rebasing 15 Oct 2026
- 0270 What is a branch? A branch is a separate line of work in Git, so you can try changes without touching the main version of the… Beginner · Explains an idea · Any system Article Branching & rebasing 15 Oct 2026
- 0271 What is a merge conflict? A merge conflict happens when two branches changed the same lines and Git needs a human to decide which version wins. Beginner · Explains an idea · Any system Article Branching & rebasing 15 Oct 2026
- 0262 Make your first pull request: Git and GitHub from first commit to merged change A complete beginner's path through Git and GitHub: set up Git, make commits, ignore files, use branches, push to GitHub, open a… Beginner · Guided project · Any system Article Branching & rebasing · Pull requests · Setup 15 Oct 2026