Branches: Create, Switch, Push, Merge, & Delete

Git Branches

Git enables you to branch out from your main codebase, creating parallel development paths that revolutionize how teams collaborate. This branching system provides unparalleled flexibility in your development workflow, allowing multiple developers to work simultaneously without interfering with each other's progress or the stability of your production code.

Consider this real-world scenario that demonstrates the power of Git branches: You're deep into developing a complex new feature for your application when an urgent bug report comes in—something that needs to be fixed and deployed immediately. Without branches, you'd face a dilemma: either abandon your unfinished work or deploy unstable code. With Git branches, you simply switch back to your main branch, implement the hotfix, and deploy it to production. Then you seamlessly return to your feature branch to continue development. When your new feature is complete and tested, you merge it into the main branch, preserving both your urgent fix and your new functionality. This workflow prevents the chaos that often accompanies concurrent development efforts.

Working on a Branch: Commit, Push, Pull, Etc.

Every Git operation you perform—whether committing changes, pushing to remote repositories, or pulling updates—occurs within the context of your current branch. This branch-specific behavior is fundamental to Git's design and critical to maintaining clean project history. Always verify you're on the correct branch before executing any Git commands, as working on the wrong branch is one of the most common sources of confusion and merge conflicts in team environments.

See What Branch You're on

Visual Studio Code displays your current branch name in the bottom-left corner of the window. The default branch name varies by platform and Git configuration—while older repositories may show master, most modern repositories use main as the default branch name, reflecting current industry best practices around inclusive terminology.

Create a New Branch

1. Click the current branch name in the bottom-left corner of the Visual Studio Code window.
2. In the command palette that appears at the top of the window, select + Create new branch.

3. Enter a descriptive name for your new branch and press Return (Mac) or Enter (Windows). Use clear, purposeful naming conventions like feature/user-authentication or bugfix/header-alignment to maintain project organization.

   You're now working on your new branch and ready to make commits that won't affect your main codebase.

Switch to a Branch in Your Local Repo

Switching between local branches allows you to context-switch between different features or experiments instantly.

1. Click the current branch name in the bottom-left corner of the Visual Studio Code window.
2. From the branch list that appears in the command palette, select the branch you want to switch to. Visual Studio Code will instantly update your workspace to reflect that branch's state.

Switch to a Branch in a Remote Repo

Working with remote branches enables collaboration with team members and access to work stored in your remote repository.

1. First, fetch the latest branch information from your remote repository. In the Source Control panel , click the More Actions button , navigate to Pull, Push, and select Fetch.
2. Click the current branch name in the bottom-left corner of the window.
3. In the branch list, remote branches are prefixed with origin/ (or your remote's name). Select the remote branch you want to work with—Visual Studio Code will automatically create a local tracking branch.

Merge a Branch

Merging integrates changes from one branch into another, typically combining feature work back into your main development branch.

1. Switch to the target branch—the branch that will receive the merged changes. In most workflows, this means switching to your main or master branch. Click the current branch name in the bottom-left corner and select your target branch.

   Professional teams often use pull requests or merge requests instead of direct merges to maintain code quality through peer review processes.

2. Ensure your working directory is clean by checking the Source Control panel for any uncommitted changes. Commit or stash any pending work before proceeding.

3. Execute the merge by clicking the More Actions button in the Source Control panel and selecting Branch > Merge Branch.

4. Choose the source branch you want to merge into your current branch.

   NOTE: Merge conflicts may occur when Git cannot automatically reconcile differences between branches. When this happens, refer to How to Handle Merge Conflicts for resolution strategies.

Delete a Local Branch

Maintaining a clean branch structure improves repository navigation and reduces confusion. Delete branches that have served their purpose and been successfully merged.

1. Switch away from the branch you want to delete—Git prevents deletion of the currently active branch as a safety measure.

2. Access the branch management menu by clicking the More Actions button in the Source Control panel and selecting Branch > Delete Branch.

3. Select the branch you want to delete from the list.

   Confirm the deletion when prompted. Remember that this only removes the local branch—remote branches require separate deletion if you want to clean up your remote repository as well.