How to create a new branch in Git

A branch in Git allows you to diverge from the main line of development and work on new features or fixes without affecting the main codebase. This guide provides a step-by-step approach to creating new branches in Git, covering everything from basic commands to more specific scenarios like branching from the main branch.

What is a branch in Git?

In Git, a branch represents an independent line of development. Branches serve as an abstraction for the edit/stage/commit process. You can think of them as a way to request a brand new working directory, staging area, and project history. New commits are recorded in the history of the current branch, which results in a fork in the history of the project.

Under the hood each branch is a lightweight, movable pointer to one of these commits. When you create a new branch, Git simply creates a new pointer; it doesn't duplicate any files or directories. Instead, Git's commit graph structure allows branches to share common history up to their point of divergence, where each branch can then record its own subsequent commits independently, effectively creating forks in the project's history without duplicating the underlying data.

Step-by-step guide to creating a new branch

1. Check your current branch

First, it's a good practice to know which branch you're currently on. You can do this by using the git status command, which will also tell you if your working directory is clean.

git status

If there are uncommitted changes, decide if you want to commit them to your current branch or leave them to commit on the new branch.

2. Create a new branch

To create a new branch, use the git branch command followed by the name of the new branch. For example, to create a branch named feature-x, you would run:

git branch feature-x

This command creates a new branch but does not switch to it automatically.

3. Switch to the new branch

After creating the new branch, you need to switch to it to start working on that branch. Use the git checkout command to switch branches:

git checkout feature-x

Alternatively, you can create and switch to the new branch in one step with:

git checkout -b feature-x

4. Branching from a specific branch

If you need to create a new branch from a specific branch, such as the main branch, first switch to that branch, then create your new branch:

git checkout main
git checkout -b feature-from-main

This sequence ensures that your new branch starts from the main branch, inheriting its current state.

Best practices for branching

• Name branches clearly: Use descriptive names for your branches (e.g., feature-add-login, bugfix-header-crash), so it's clear what work is being done on each branch. See this guide on Git branch naming conventions for more information.
• Keep branches short-lived: Merge branches back into the main branch as soon as the feature or fix is complete to avoid a more complex merge later.
• Regularly pull changes: If your main branch is active, regularly pull changes from main to your feature branches to keep them up-to-date and minimize merge conflicts.

Git commands to create a new branch:

• git branch <branch-name>: Creates a new branch.
• git checkout <branch-name>: Switches to the specified branch.
• git checkout -b <branch-name>: Creates a new branch and switches to it.
• git checkout main: Switches to the main branch.

Creating branches with Graphite

Integrating the Graphite CLI can simplify the branch creation process, especially when working with stacked changes.

What is the Graphite CLI?

Graphite's CLI extends Git's capabilities, focusing on stacked changes and simplifying trunk-based development. It provides an easy way to manage dependencies between branches and enhance the pull request workflow.

Creating a new branch with Graphite

Graphite simplifies creating and managing branches as part of a stack. Here’s how you can start:

1. Check your current branch: Ensure you're on the correct branch where you want to base your new changes.

   Terminal

   gt checkout main
   
   

2. Create a new branch: Use the gt create command to start a new branch. This command not only creates the branch but also stages changes and prepares them for commit.

   Terminal

   touch your-file.txt
   gt create -am "Add new feature"
   
   

   This command performs the following:

   • Creates a new file or modifies existing files.
   • Stages the changes.
   • Commits the changes with a message.
   • Creates a new branch for these changes.

3. Navigate and manage your stack: Graphite offers commands like gt up and gt down to navigate through your stack. You can visualize the stack with gt log.

Summary

Branching in Git is a core skill for any developer, enabling efficient, isolated development without disrupting the main codebase. By adopting best practices such as clear naming conventions and keeping branches short-lived, you can maintain a clean and efficient workflow. Additionally, integrating tools like Graphite can further enhance your ability to handle complex development workflows with ease, making it easier to manage dependencies and streamline your development process.