Back to Git & GitHub

Working with Branches

Understand the power of branching for parallel development, feature creation, and bug fixing.

Day 3

Topics in this Chapter

1

Introduction to Branching

Understand what branches are and how to create and list them.

2

Switching Branches with git checkout

How to switch between different branches in your repository.

3

Merging Branches with git merge

Learn how to integrate changes from one branch into another.

4

Handling Merge Conflicts

What to do when Git cannot automatically merge changes and a conflict occurs.

5

Deleting a Branch

How to safely delete local and remote branches after they have been merged.

GeekDost - Roadmaps & Snippets for Developers