Walk-Through: How to Merge Changes from Branches

Learn how to build features separately, then combine when you’re ready to make shipping your product faster and more reliable.

Abhinav Narain
February 21, 2024 • 2 minute read
Mockup of merging changes from branches in the Bubble editor.

Whether you’re building new features, trying experimental approaches, or working on a hotfix, the concept of merging changes from branches is a core software development principle that helps programmers ship smoothly.

On Bubble, you can work on multiple features at the same time by building on different branches to isolate workstreams. You can test these different branches individually and merge the changes when they’re ready — we’ll even guide you through the steps required to successfully merge work from one branch into another branch and flag any potential conflicts along the way.

We make the merge and conflict resolution processes more visual, accessible, and understandable with these industry-standard best practices. Let’s walk through an example of how this works in practice:

Merge changes clearly and logically

From your editor, select Main in the upper right-hand corner. From there, you can select the branch that contains the changes you’d like to merge. Confirm your selection to kick off the merge process. 

Minimize errors with the guided merge flow

After you select the branch that you’d like to merge, the guided merge flow shows you a step-by-step merge process that previews what the result of your merge will look like. If you see anything you don’t like, you can cancel your merge without consequence.

Fix issues quickly with conflict resolution

We’ll flag any conflicts that arise when you merge branches, so you can pinpoint and resolve the differences. Our conflict resolution UI organizes conflicts by page and gives you the option to resolve all conflicts in favor of one branch on a page-by-page basis.

Divide, conquer, and experiment 

Using branches as part of a version control process helps you shorten your development cycles by enabling teams to divide and conquer — but solo Bubble devs can equally benefit from branching. For example, if you want to experiment with new ideas or work on multiple features at the same time, you can isolate your work into branches to keep what you like, delete what you don’t, and merge each branch on its own timeline. 

🌱
To get the most out of Bubble version control, upgrade to the Growth plan to take advantage of all the merging magic we have to offer.
Start building with a free account

Build your app on Bubble's Free plan. No need to upgrade until you're ready to launch your app.

Join building

LATEST STORIES

Abstract visual of a mobile app with three cards and navigation, and a zoomed-in view of a desktop website with several cards.

The 10 Best Mobile Website Builders in 2026 for Every Goal

Compare the top mobile website builders — from design-first tools to e-commerce platforms — and find the one that fits your goal without requiring a rebuild later.

Bubble
November 20, 2026 • 18 minute read
A lock icon and a check icon sliding across the screen in two parallel lines

Root Cause Analysis (RCA): October 2026 Security Incident

Our root cause analysis of the October 26, 2026 security incident: what happened, what we’ve fixed, and what app owners should do now.

Bubble
November 20, 2026 • 5 minute read
Bubble and Base44 logos on connected purple shapes, showing Bubble vs Base44 comparison on dark gradient background

Bubble Vs. Base44 Comparison: Which AI App Builder Is Right For You?

Find the right AI app builder for your project with this comparison of Bubble vs. Base44 — covering development workflow, design control, backend and database visibility, mobile publishing, integrations, security, and pricing.

Bubble
November 12, 2026 • 20 minute read
BiteFind live in the iOS and Android app stores with a banner that says Live

Native Mobile Is Out of Beta, Faster, and More Reliable

Bubble for native mobile is now available to everyone. See what’s new, what it means for your app’s reliability, and how to bring an existing Bubble web app to mobile.

Bubble
November 12, 2026 • 4 minute read

Root Cause Analysis (RCA): October 2026 Security Incident

November 20, 2026 • 5 minute read

What Can You Build on Bubble? 25 Examples to Inspire You

September 08, 2026 • 14 minute read

The Easiest Way to Build a Custom CRM With AI

September 01, 2026 • 17 minute read

What Is Bubble AI and How Does It Build Apps?

August 19, 2026 • 12 minute read

See How We Redesigned the Property Editor for Better Building

December 11, 2025 • 4 minute read

Build the next big thing with Bubble

Start building for free