2026-04-297 min read

Mary pushes the feature to her Bitbucket repository (Git & Dev Tools)

Learn Mary pushes the feature to her Bitbucket repository (Git & Dev Tools) step by step with clear examples and exercises.

Title: Mastering Pull Requests in Bitbucket: A full guide on Git and Developer Tools

Why This Matters

In today's fast-paced development world, version control systems like Git are essential for managing code changes effectively. Bitbucket is a popular web-based hosting service for Git repositories that offers additional features such as continuous integration (CI) and pull requests. Understanding how to use pull requests in Bitbucket can help you collaborate more efficiently with other developers, reduce errors, and maintain a clean and organized project history.

Pull requests facilitate collaboration by allowing developers to propose changes made on a feature branch and request that those changes be merged into the main branch. This process helps ensure that code is reviewed, tested, and approved before being integrated into the main codebase. By using pull requests, teams can work together more effectively, improve code quality, and reduce the risk of introducing bugs or conflicts.

Prerequisites

To follow this guide, you should have a basic understanding of:

Git fundamentals (commits, branches, merge)
Bitbucket account setup
Basic familiarity with the command line interface (CLI) or Git client like GitKraken or SourceTree
Understanding of the Bitbucket user interface and its features
Familiarity with your project's coding standards, testing practices, and collaboration workflows

Core Concept

A pull request in Bitbucket is a way to propose changes made on a feature branch and request that those changes be merged into the main branch. The process involves three key steps: creating a new branch, pushing the branch to the Bitbucket repository, and submitting a pull request.

Create a new branch: Start by creating a new branch for your feature or bug fix. This ensures that your work is isolated from the main codebase until it's ready to be merged.

git checkout -b my-feature-branch

Make changes and commit them: Make your desired changes, then stage and commit them using Git commands.

git add .
git commit -m "Adding feature X"

Push the branch to Bitbucket: Once you've committed your changes, push the new branch to your Bitbucket repository.

git push origin my-feature-branch

Create a pull request: After pushing your branch, navigate to your Bitbucket repository and create a pull request from the "Pull requests" tab. Select the source branch (my-feature-branch) and the target branch (usually main or master).

Review and merge the pull request: Reviewers will examine your changes, discuss potential improvements, and decide whether to merge the pull request into the main codebase. Once approved, the pull request is merged, and your feature becomes a part of the project.

Worked Example

Let's walk through an example where we add a new feature to an existing Bitbucket repository:

Create a new branch for the feature:

git checkout -b add-new-feature

Make changes and commit them:

Add a new file

echo "Hello, World!" > new_file.txt

git add new_file.txt

git commit -m "Adding new file for feature"

Modify an existing file

echo "Updated content" >> existing_file.txt

git add existing_file.txt

git commit -m "Updating existing file for feature"


3. Push the branch to Bitbucket:

git push origin add-new-feature


4. Create a pull request: Navigate to your Bitbucket repository, click on the "Pull requests" tab, and then click the "Create pull request" button. Select the source and target branches as described earlier.

---

Common Mistakes

Not creating a separate branch for each feature: Working on multiple features simultaneously can lead to conflicts and make it difficult to manage changes effectively.
Not committing frequently: Committing often helps you maintain a clean codebase, making it easier to identify and fix issues.
Ignoring review feedback: It's essential to address reviewer feedback promptly and thoroughly to ensure the quality of your work.
Merging pull requests without testing: Always test your changes before merging them into the main codebase to avoid introducing bugs.
Not keeping the pull request description up-to-date: Make sure to provide a clear and concise description that explains what the pull request does, any relevant context, and any necessary instructions for reviewers.
Not using proper branch naming conventions: Use descriptive branch names (e.g., feature/add-new-feature) to make it easy for others to understand the purpose of your branches.
Not setting up automatic build and test configurations: Configure your Bitbucket repository to automatically run tests and builds when a pull request is created or updated, ensuring that any issues are caught early.
Not addressing merge conflicts promptly: If merge conflicts arise during the pull request process, address them as soon as possible to prevent delays in the review and merging process.
Not communicating effectively with team members: Clear and concise communication is crucial for successful collaboration. Make sure to keep your team informed about your progress, any issues you encounter, and any changes to the project's scope or timeline.
Not following coding standards and best practices: Adhering to established coding standards and best practices helps ensure that your code is maintainable, scalable, and easy for others to understand and work with.

Practice Questions

You have created a new feature branch but forgot to add it to Git. How can you stage and commit the changes?

git add .
git commit -m "Initial commit of new feature"

Your teammate has created a pull request, but you notice some issues with their code. What should you do next?

Discuss the issues with your teammate and suggest potential solutions. Once agreed upon, ask them to make the necessary changes and resubmit the pull request for review.

You've created a new feature branch, made changes, and committed them locally. However, when you try to push the branch to Bitbucket, you receive an error message about not having permission to push to the repository. What should you do?

Contact your team lead or project manager to grant you access to the repository, or ask someone with appropriate permissions to merge your changes for you.

You've created a pull request and are waiting for feedback from your teammates. However, several days have passed, and you haven't received any responses. What should you do?

Follow up with your teammates to check on the status of their review and address any questions or concerns they may have. If necessary, escalate the issue to a project manager or team lead if there are delays in the review process.

You've created a new feature branch, made changes, and committed them locally. However, when you try to push the branch to Bitbucket, you receive an error message about merge conflicts with the main branch. What should you do?

Resolve the merge conflicts by manually editing the conflicting files, then committing and pushing the changes again. If you're unable to resolve the conflicts, seek help from your teammates or a project manager.

FAQ

What happens if a pull request is not merged immediately? Pull requests can remain open indefinitely until they are reviewed and approved by team members. It's essential to keep the conversation going and address any feedback promptly.
Can I merge a pull request directly from the command line? Yes, it's possible to merge a pull request using Git commands, but it's generally recommended to use Bitbucket's web interface for a more streamlined process that includes code review and discussion features.
How can I customize the automated build and test configurations in my Bitbucket repository? Configure your Bitbucket pipeline by creating a bitbucket-pipelines.yml file in the root of your repository, which specifies the steps to be executed during the build and test process.
What are some best practices for writing effective pull request descriptions? Write clear, concise, and informative descriptions that explain what the pull request does, any relevant context, and any necessary instructions for reviewers. Use proper grammar, spelling, and punctuation to make your description easy to read and understand.
What are some common branch naming conventions in Git? Common branch naming conventions include using descriptive names (e.g., feature/add-new-feature or bugfix/fix-login-issue) that clearly indicate the purpose of the branch. Avoid using ambiguous or misleading names, and follow any team-specific naming conventions if they exist.
How can I rebase my feature branch onto the latest main branch before creating a pull request? To rebase your feature branch onto the latest main branch, use the following commands:

git checkout my-feature-branch
git fetch origin
git rebase origin/main

This will ensure that your feature branch is up-to-date with the latest changes in the main branch before creating a pull request.