2.1.2 Branching & rebasing
Every entry filed under Branching & rebasing and its subtopics.
Level
- Beginner 1
- Intermediate 2
- Advanced 0
Kind
Clear filters
- Tutorial 1
- Concept 1
- How-to 0
- Reference 0
- Fix 1
3 entries match these filters
- 0034 Merging vs rebasing in Git Merge and rebase both bring commits from one branch into another. Merge keeps history exactly as it happened; rebase replays your commits… Intermediate · Concept · Any system Article Branching & rebasing 15 Oct 2026
- 0041 Fix: CONFLICT (content): Merge conflict in … Two branches changed the same lines and Git cannot choose for you. Open the file, keep the right text, remove the markers,… Intermediate · Fix · Any system Article Branching & rebasing · Common errors 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 · Tutorial · Any system Article Branching & rebasing · Pull requests · Setup 15 Oct 2026