XQA
Back to Git & Dev Tools
2026-03-107 min read

Learn Branching with Bitbucket Cloud (Git & Dev Tools)

Learn Learn Branching with Bitbucket Cloud (Git & Dev Tools) step by step with clear examples and exercises.

Title: Mastering Branching with Bitbucket Cloud (Git & Dev Tools) - Expanded Version

Why This Matters

Branching is an essential Git concept that allows developers to work on different features or fixes without affecting the main codebase. It offers a secure environment for experimentation and collaboration, making it an indispensable skill for any developer. In this comprehensive lesson, we will delve into creating, managing, and merging branches using Bitbucket Cloud, a popular Git repository hosting service by Atlassian.

The Importance of Branching

Branching enables developers to work on multiple features or fixes concurrently without interfering with each other's work. This approach promotes collaboration, as team members can work independently and merge their changes when ready. Additionally, branching provides a secure environment for testing new features or experimental changes before merging them into the main codebase.

Prerequisites

  • Familiarity with Git basics such as commits, pull requests, merging, and branching concepts
  • Comfortable navigating the command line interface (CLI) or utilizing a Git client like SourceTree or Tower
  • A Bitbucket Cloud account and a repository to practice with

Additional Prerequisites

  • Understanding of Git workflows such as GitFlow, Feature Branch Workflow, and GitHub Flow
  • Familiarity with using Bitbucket Cloud's web UI for managing repositories and branches

Core Concept

Creating a Branch

Bitbucket Cloud allows you to create branches through the web UI or command line interface.

Web UI

  1. Navigate to your repository on Bitbucket.
  2. Click on the Branches tab located on the left-hand menu.
  3. Click the Create branch button.
  4. Enter a name for your new branch, select the base branch (usually master or main), and click Create.

Command Line

  1. Open your terminal and navigate to your local repository.
  2. Run the following command to create a new branch:
git checkout -b <branch-name> origin/<base-branch>

Replace ` with the name you want for your new branch and with the name of the base branch (e.g., master or main`).

Working on a Branch

Once you've created a branch, you can make changes, commit them, and push them to Bitbucket Cloud. To switch between branches, use the following command:

git checkout <branch-name>

Understanding Git Workflows

Git workflows such as GitFlow, Feature Branch Workflow, and GitHub Flow provide guidelines for managing branches in a repository. These workflows help ensure that your team's development process is efficient, secure, and maintainable. Familiarize yourself with these workflows to make the most of branching in Bitbucket Cloud.

Merging a Branch

When you're ready to merge your changes back into the main branch, follow these steps:

  1. Switch to the base branch:
git checkout master
  1. Fetch and merge the changes from the feature branch:
git fetch origin
git merge <feature-branch>
  1. Resolve any conflicts that may arise during the merge.
  2. Commit the merge with a descriptive commit message:
git commit -m "Merged <feature-branch>"
  1. Push the changes to Bitbucket Cloud:
git push origin master
  1. Create and review a pull request (if using a Git workflow that requires it) before merging the branch into the main branch.

Deleting a Branch

After merging your branch, you can delete it from both your local and remote repositories using these commands:

Local Repository

git branch -d <branch-name>

Remote Repository (Bitbucket Cloud)

  1. Navigate to the Branches tab in Bitbucket.
  2. Find your branch and click on the Delete button next to it.
  3. Confirm the deletion when prompted.

Merge Strategies

Bitbucket Cloud supports various merge strategies, such as recursive, ours, and theirs. These strategies can help resolve conflicts more effectively during a merge. You can specify a merge strategy using the following command:

git merge --strategy=<merge-strategy> <feature-branch>

Branch Protection Rules

Bitbucket Cloud offers branch protection rules that allow you to enforce certain requirements on branches, such as requiring pull requests for merging or restricting who can push directly to the branch. These rules help maintain the quality and security of your codebase.

Worked Example

In this example, we will create a new feature branch, make changes, commit them, merge the branch back into the main branch using a pull request, and delete the feature branch.

  1. Create a new feature branch called feature/my-changes:
git checkout -b feature/my-changes origin/master
  1. Make some changes to a file (e.g., adding a new function or fixing a bug).
  2. Commit the changes with an informative commit message:
git add <file>
git commit -m "Added new function"
  1. Push the changes to Bitbucket Cloud:
git push origin feature/my-changes
  1. Create a pull request from the feature/my-changes branch to the main branch.
  2. Address any review comments and merge the pull request into the main branch.
  3. Switch back to the main branch:
git checkout master
  1. Delete the feature branch from your local repository:
git branch -d feature/my-changes
  1. Delete the feature branch from Bitbucket Cloud (see "Deleting a Branch" section above).

Common Mistakes

1. Not Creating a New Branch Before Making Changes

Always create a new branch before making changes to avoid affecting the main codebase.

Subheading: Common Mistakes - Branching Best Practices

  • Adhering to best practices such as creating a new branch for each feature or fix ensures that your work is isolated and easier to manage.
  • Frequently create and merge small, focused branches to minimize the risk of conflicts and make it easier to track changes.

2. Forgetting to Fetch Before Merging

Always fetch the latest changes from the remote repository before merging to ensure you're merging the correct version of the feature branch.

Subheading: Common Mistakes - Fetching Best Practices

  • Regularly fetching updates from the remote repository helps keep your local branch up-to-date and reduces the risk of merge conflicts.
  • Use git fetch to retrieve the latest changes without merging them into your current branch.

3. Ignoring Conflicts During Merge

Always resolve conflicts during a merge to avoid introducing unwanted changes into your codebase.

Subheading: Common Mistakes - Resolving Conflicts

  • Use a merge tool or manual editing to resolve conflicts between conflicting changes in the feature and main branches.
  • Carefully review any resolved conflicts to ensure that the merged codebase behaves as intended.

4. Neglecting Branch Protection Rules

Enforcing branch protection rules helps maintain the quality and security of your codebase. Be sure to set up appropriate rules for your repositories.

Subheading: Common Mistakes - Branch Protection Rule Best Practices

  • Carefully configure branch protection rules based on your team's workflow and requirements.
  • Enforce rules such as requiring pull requests, restricting direct pushes, and setting minimum required reviewers to maintain code quality and security.

Practice Questions

  1. How do you create a new branch in Bitbucket Cloud using the command line?
  2. What is the purpose of merging branches, and why is it important?
  3. If you encounter a conflict during a merge, what steps should you take to resolve it?
  4. How can you delete a branch from your local repository and Bitbucket Cloud?
  5. Describe the benefits of using different merge strategies during a merge.
  6. Explain how branch protection rules help maintain the quality and security of a codebase.
  7. What are some best practices for creating, managing, and merging branches in Git?
  8. How can you fetch updates from the remote repository without merging them into your current branch?
  9. What is the purpose of a pull request, and when should it be used during the development process?
  10. Describe the differences between merge strategies such as recursive, ours, and theirs.

FAQ

Q: Can I merge a feature branch directly into the main branch without creating an intermediate pull request?

A: Yes, you can merge a feature branch directly into the main branch using the git merge command. However, it's generally recommended to create and review a pull request before merging to ensure that your changes are properly tested and reviewed.

Q: What happens if I delete a branch in my local repository but not on Bitbucket Cloud?

A: If you delete a branch locally but not on Bitbucket Cloud, the deleted branch will still be visible and accessible on Bitbucket Cloud until it's manually deleted there as well.

Q: Can I rename a branch in Bitbucket Cloud?

A: Yes, you can rename a branch in Bitbucket Cloud by using the Rename Branch feature available under the Branches tab.

Q: What is the difference between a pull request and a merge commit?

A: A pull request is a request to merge changes from one branch into another, typically used for code review and collaboration. A merge commit is the actual act of merging two branches together in Git, resulting in a new commit that combines both sets of changes.

Learn Branching with Bitbucket Cloud (Git & Dev Tools) | Git & Dev Tools | XQA Learn