Git Notes

Hub Benefits of Git and GitHub - Why They Matter Git vs GitHub Version Control System What Is Git What Is GitHub Configure Git - User Identity and Settings Create GitHub Account - Sign Up Guide First Git Repository - Getting Started Install Git on Linux - Complete Setup Guide Install Git on macOS - Installation Guide Install Git on Windows - Step-by-Step Guide Git Add - Stage Changes Git Clone - Copy Remote Repositories Locally Git Commit - Save Changes Git Diff - Compare Changes in Your Repository Git Ignore - Exclude Files from Version Control Git Init - Initialize Repository Git Log - View Commit History Git Status - Check Repository State Git Fetch - Download Remote Changes Without Merging Git Pull - Fetch and Merge Remote Changes Git Push - Upload Local Commits to Remote Repository Git Remote - Manage Remote Repository Connections Local Repository - Understanding Your Git Working Environment Remote Repository - Collaborate Through Shared Repositories Sync Local and Remote - Keep Repositories in Harmony Amend Commit - Fix Last Commit Delete Branch - Clean Up Branches Git Reset - Move HEAD and Undo Commits Git Restore - Discard Changes Git Revert - Safely Undo Changes Recover Lost Commits - Reflog Guide Fork Repository GitHub Pages GitHub Profile Setup GitHub Repositories GitHub Stars and Watchers Repository Settings Code Reviews Git Clone Git Fetch Git Pull Git Push GitHub Issues Labels and Milestones Open Source Contributions GitHub Project Boards Pull Requests - Propose and Review Code Changes Team Collaboration with Git and GitHub Automated Testing with GitHub Actions CI/CD with GitHub Actions Deployment Automation with GitHub Actions Introduction to GitHub Actions GitHub Actions Runners GitHub Actions Workflows Enterprise Git Workflows - Scale Git for Large Organizations Feature Branch Workflow - Isolate Development Work GitFlow Workflow - Structured Release Management Monorepo Workflow - Manage Multiple Projects in One Repository Trunk-Based Development - Ship Code Fast and Safely Deployment Workflows GitHub Pages Deployment Netlify Deployment from GitHub Render Deployment from GitHub Vercel Deployment from GitHub Branch Protection Rules - Secure Your Git Branches Personal Access Tokens - Authenticate with GitHub Repository Security Best Practices Secret Scanning - Detect Leaked Credentials in Code Signed Commits - Verify Commit Authenticity with GPG SSH Keys - Secure Git Authentication Without Passwords Git Bisect - Find Bugs with Binary Search Git Cherry-Pick - Apply Specific Commits to Any Branch Git Hooks - Automate Workflows with Git Events Git Internals - Understanding How Git Works Under the Hood Git Stash - Temporarily Save Uncommitted Changes Git Submodules - Manage External Dependencies as Git Repos Git Tag - Mark Important Points in History Git Worktrees - Work on Multiple Branches Simultaneously Collaborative Web App Project Complete Team Workflow Project GitHub Actions Project - Build a CI/CD Pipeline Open Source Project Contribution - Guided Exercise Portfolio Project with Git - Showcase Your Skills Git Command Cheatsheet Git Interview Questions - Comprehensive Preparation Guide GitHub Interview Questions Scenario-Based Git Interview Questions Git Troubleshooting Guide Git Best Practices - Professional Development Habits Common Git Errors and Fixes - Quick Solutions Git Command Reference - Complete Command Guide Learning Resources - Continue Your Git & GitHub Education Branch Strategies - Choosing the Right Git Branching Model Create Branch in Git - Start New Development Lines Fast-Forward Merge in Git - Clean Linear History Git Branch Git Checkout Git Merge Git Rebase Merge Branches in Git - Combine Development Work Merge Conflicts - Resolve Git Conflicts Like a Pro Switch Branch in Git - Navigate Between Branches

Git Branch

Branching is one of the most powerful features in Git, and understanding how to work with branches effectively is what separates a beginner from a...

Branching is one of the most powerful features in Git, and understanding how to work with branches effectively is what separates a beginner from a proficient developer. Think of branches as parallel universes for your code — each branch lets you work on something different without affecting the main timeline of your project.

Understanding Branches Conceptually

In traditional file management, if you wanted to try something new with your project, you might copy the entire folder and work on the copy. Git branches accomplish the same goal but in an incredibly efficient way. Instead of duplicating files, Git simply creates a new pointer to the current commit. This means creating a branch is nearly instantaneous, regardless of your project size.

A branch in Git is essentially a lightweight movable pointer to a commit. The default branch in most repositories is called main (or master in older repositories). Every time you make a commit, the branch pointer moves forward automatically to point to your latest commit.

Creating Branches

The most straightforward way to create a new branch is using the git branch command:

bash example

git branch feature-login

This creates a new branch called feature-login that points to the same commit you are currently on. However, it does not switch you to that branch. You remain on whatever branch you were on before running this command.

To create a branch and immediately switch to it, you can combine the commands:

bash example

git checkout -b feature-login

Or using the newer syntax introduced in Git 2.23:

bash example

git switch -c feature-login

Both of these commands create the branch and move your HEAD pointer to the new branch in one step.

Listing Branches

To see all local branches in your repository:

bash example

git branch

The output might look like this:

Example

feature-login fix-navbar * main staging

The asterisk indicates your current branch. To also see remote-tracking branches:

bash example

git branch -a

This shows both local and remote branches:

Example

feature-login * main remotes/origin/main remotes/origin/feature-login remotes/origin/develop

If you want to see branches along with their last commit message:

bash example

git branch -v

Renaming Branches

Sometimes you realize a branch name does not clearly describe what you are working on. You can rename your current branch:

bash example

git branch -m new-branch-name

To rename a branch you are not currently on:

bash example

git branch -m old-name new-name

Deleting Branches

After merging a feature branch, you typically want to clean it up:

bash example

git branch -d feature-login

The lowercase -d flag only deletes the branch if it has been fully merged. If you want to force-delete an unmerged branch (and accept losing that work):

bash example

git branch -D feature-login

How Branches Work Internally

Under the hood, a Git branch is simply a file stored in .git/refs/heads/ that contains the 40-character SHA-1 hash of the commit it points to. When you create a branch, Git creates this small file. When you make a new commit on that branch, Git updates this file with the new commit hash.

The special pointer called HEAD tells Git which branch you are currently on. It is stored in .git/HEAD and typically contains a reference like ref: refs/heads/main.

Practical Branch Naming Conventions

In professional environments, teams adopt naming conventions for branches. Common patterns include:

Example

feature/user-authentication bugfix/login-redirect-error hotfix/security-patch-2024 release/v2.1.0 docs/update-api-reference

These prefixes make it immediately clear what type of work a branch contains and help with automation in CI/CD pipelines.

Common Branching Scenarios

Scenario 1: Starting new feature work

You are on main and need to build a new dashboard:

bash example

git switch -c feature/dashboard
# Work on your feature, make commits
git add .
git commit -m "Add dashboard layout component"

Scenario 2: Quick bug fix while working on a feature

You are mid-way through a feature when a critical bug is reported:

bash example

git stash                    # Save current work
git switch main              # Go back to main
git switch -c hotfix/critical-bug
# Fix the bug
git commit -am "Fix null pointer in payment processing"
git switch main
git merge hotfix/critical-bug
git switch feature/dashboard  # Return to feature
git stash pop                # Restore your work

Branch Tracking and Upstream

When you push a local branch to a remote for the first time, you set up tracking:

bash example

git push -u origin feature-login

The -u flag sets the upstream, so future git push and git pull commands know which remote branch to interact with. You can check tracking relationships with:

bash example

git branch -vv

Common Mistakes and How to Avoid Them

One frequent mistake is creating a branch from the wrong starting point. Always verify which branch you are on before creating a new one:

bash example

git status          # Check current branch
git switch main     # Ensure you are on main
git pull            # Get latest changes
git switch -c feature/new-work  # Now create your branch

Another common issue is accumulating stale branches. Periodically clean up merged branches:

bash example

git branch --merged main | grep -v main | xargs git branch -d

This command lists all branches merged into main, excludes main itself, and deletes them.

Key Takeaways

Branches in Git are cheap to create and essential for organized development. They let you isolate work, experiment safely, and collaborate without stepping on each other's code. Master branch management, and you will find your development workflow becomes significantly smoother and more productive.

Exam Focus

Revise definitions, diagrams, examples, and short-answer points for Git Branch.

Interview Use

Prepare one clear explanation, one practical example, and one common mistake for this Git & GitHub topic.

Search Terms

git-github, git & github, git, github, branching, and, merging, branch

Related Git & GitHub Topics

Continue learning this concept

Branching And MergingBranch Strategies - Choosing the Right Git Branching ModelExplore popular Git branching strategies including GitFlow, GitHub Flow, and trunk-based development. Learn when to use each strategy for your team and project.Branching And MergingCreate Branch in Git - Start New Development LinesLearn how to create branches in Git for feature development, bug fixes, and experimentation. Understand branch creation from different starting points.Branching And MergingSwitch Branch in Git - Navigate Between BranchesLearn how to switch between branches using git checkout and git switch. Understand branch switching behavior, stashing changes, and handling uncommitted work.Branching And MergingFast-Forward Merge in Git - Clean Linear HistoryUnderstand fast-forward merges in Git, when they happen, how they differ from three-way merges, and how to control merge behavior with --no-ff and --ff-only flags.Branching And MergingGit CheckoutThe git checkout command is one of the most versatile commands in Git, which is both its strength and its source of confusion for newcomers. Historically,...Branching And MergingGit MergeMerging is the process of combining the work from two different branches into one. It is how features developed in isolation come together to form a...

PreviousFast-Forward Merge in Git - Clean Linear History NextGit Checkout

Git Notes

Git Branch

Branching is one of the most powerful features in Git, and understanding how to work with branches effectively is what separates a beginner from a...

Understanding Branches Conceptually

Creating Branches

The most straightforward way to create a new branch is using the git branch command:

bash example

git branch feature-login

To create a branch and immediately switch to it, you can combine the commands:

bash example

git checkout -b feature-login

Or using the newer syntax introduced in Git 2.23:

bash example

git switch -c feature-login

Both of these commands create the branch and move your HEAD pointer to the new branch in one step.

Listing Branches

To see all local branches in your repository:

bash example

git branch

The output might look like this:

Example

feature-login fix-navbar * main staging

The asterisk indicates your current branch. To also see remote-tracking branches:

bash example

git branch -a

This shows both local and remote branches:

Example

feature-login * main remotes/origin/main remotes/origin/feature-login remotes/origin/develop

If you want to see branches along with their last commit message:

bash example

git branch -v

Renaming Branches

Sometimes you realize a branch name does not clearly describe what you are working on. You can rename your current branch:

bash example

git branch -m new-branch-name

To rename a branch you are not currently on:

bash example

git branch -m old-name new-name

Deleting Branches

After merging a feature branch, you typically want to clean it up:

bash example

git branch -d feature-login

The lowercase -d flag only deletes the branch if it has been fully merged. If you want to force-delete an unmerged branch (and accept losing that work):

bash example

git branch -D feature-login

How Branches Work Internally

The special pointer called HEAD tells Git which branch you are currently on. It is stored in .git/HEAD and typically contains a reference like ref: refs/heads/main.

Practical Branch Naming Conventions

In professional environments, teams adopt naming conventions for branches. Common patterns include:

Example

feature/user-authentication bugfix/login-redirect-error hotfix/security-patch-2024 release/v2.1.0 docs/update-api-reference

These prefixes make it immediately clear what type of work a branch contains and help with automation in CI/CD pipelines.

Common Branching Scenarios

Scenario 1: Starting new feature work

You are on main and need to build a new dashboard:

bash example

git switch -c feature/dashboard
# Work on your feature, make commits
git add .
git commit -m "Add dashboard layout component"

Scenario 2: Quick bug fix while working on a feature

You are mid-way through a feature when a critical bug is reported:

bash example

git stash                    # Save current work
git switch main              # Go back to main
git switch -c hotfix/critical-bug
# Fix the bug
git commit -am "Fix null pointer in payment processing"
git switch main
git merge hotfix/critical-bug
git switch feature/dashboard  # Return to feature
git stash pop                # Restore your work

Branch Tracking and Upstream

When you push a local branch to a remote for the first time, you set up tracking:

bash example

git push -u origin feature-login

The -u flag sets the upstream, so future git push and git pull commands know which remote branch to interact with. You can check tracking relationships with:

bash example

git branch -vv

Common Mistakes and How to Avoid Them

One frequent mistake is creating a branch from the wrong starting point. Always verify which branch you are on before creating a new one:

bash example

git status          # Check current branch
git switch main     # Ensure you are on main
git pull            # Get latest changes
git switch -c feature/new-work  # Now create your branch

Another common issue is accumulating stale branches. Periodically clean up merged branches:

bash example

git branch --merged main | grep -v main | xargs git branch -d

This command lists all branches merged into main, excludes main itself, and deletes them.

Key Takeaways

Exam Focus

Revise definitions, diagrams, examples, and short-answer points for Git Branch.

Interview Use

Prepare one clear explanation, one practical example, and one common mistake for this Git & GitHub topic.

Search Terms

git-github, git & github, git, github, branching, and, merging, branch

Related Git & GitHub Topics

Continue learning this concept

PreviousFast-Forward Merge in Git - Clean Linear History NextGit Checkout