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.