Branching & Merging Basics

Welcome to branching! In Git, a branch is essentially an independent line of development. Think of it like taking a copy of your project at a certain point and then working on that copy without affecting the original.

Branches are crucial for:

• Isolating features: Work on new features or bug fixes without breaking the main project.
• Experimentation: Try out new ideas without fear of ruining your stable codebase.
• Collaboration: Multiple developers can work on different parts of a project simultaneously.

When you initialize a new Git repository, you start with a single default branch. This is commonly named main (or sometimes master, depending on the Git version and configuration).

The main branch is usually considered the stable, production-ready version of your project. All new features or fixes are typically developed on separate branches and later merged back into main.

To create a new branch, you use the git branch command followed by the name you want to give your new branch. This command creates a new pointer to the current commit.

For example, to start working on a 'new-feature':

To see all the branches in your local repository, you can simply run git branch without any arguments. It will list all branches and highlight the one you are currently on with an asterisk (*).

Try running this command after creating a branch:

Creating a branch doesn't automatically switch you to it. To move from your current branch to another, you use the git switch command.

For example, to move to the new-feature branch we just created:

Once you've switched to your new branch (e.g., new-feature), any changes you make and commit will only exist on that branch. The main branch remains untouched.

This isolation allows you to develop without impacting the stable version of your project.

Let's imagine creating a file and committing it on our new-feature branch:

Once you've finished developing on your feature branch and are happy with the changes, you'll want to integrate them back into your main branch. This process is called merging.

Merging combines the history and changes from one branch into another, bringing your feature into the main line of development.

To merge your feature branch into main, first switch back to the main branch. Then, use the git merge command followed by the name of the branch you want to merge into the current branch.

Git will try to integrate the changes. If there are no conflicts, it's usually a fast-forward merge, meaning the main branch pointer just moves forward.

After successfully merging a feature branch into main, you often no longer need the feature branch itself. It's good practice to delete merged branches to keep your repository clean and organized.

Use the git branch -d command, which safely deletes a branch only if it has been fully merged into its upstream branch (or the current branch).

You've learned how to create, switch, and merge branches. Let's test your understanding.

Great job! You've grasped the fundamentals of Git branching and merging. Here's what we covered:

• Branches provide isolated lines of development.
• The main branch is typically your stable codebase.
• Use git branch <name> to create a new branch.
• Use git switch <name> to navigate between branches.
• Use git merge <branch-to-merge> to integrate changes from one branch into your current branch.
• Use git branch -d <name> to safely delete merged branches.

Branches are a core part of collaborative Git workflows, enabling powerful and flexible development.