Git: Branching & Merging

Wishlist Share

About Course

Branches let you work on new features and fixes without breaking the main code. Learn how Git branches work, how to create, switch, merge and delete them, how to resolve merge conflicts calmly, and how rebasing differs from merging, with commands you can try in your own repository.

Commands were tested with Git 2.43. Output wording may vary slightly between Git versions. Always back up or commit important work before experimenting with merges and rebases.

What Will You Learn?

  • Understand what a branch really is in Git Create, switch, list and delete branches with git switch and git branch Merge branches and recognise fast-forward and merge commits Resolve merge conflicts and know when to use rebase

Course Content

Course Lessons

  • What a branch is
  • Creating, switching and deleting branches
  • Merging and merge conflicts
  • Rebase, workflows and good practice

Sources & Further Reading
The official guidance this course is based on.

Final Assessment

Student Ratings & Reviews

No Review Yet
No Review Yet

Want to receive push notifications for all major on-site activities?

✕