Introducing Bubble’s New Version Control

Announcements
94

In short, yes. There is also a very safe way to do this.

Situation 1: Your Live = development-2 (ie no open work in that branch at the moment)

  1. In the more actions menu on Main, click “Reset to Live” to make your Main branch the same as whats in Live. You can now delete, or just sideline, the development-2 branch. You now have a clean Main to create new branches and start new development work.

Situation 2: development-2 has work that does not yet exist in Live

  1. In the more actions menu on Main, click “Reset to Live” to make your Main branch the same as whats in Live. This gives you a stable place to start the merge with development-2
  2. Create a new branch off of development-2 to save the work that exists in development-2
  3. Merge Main into development-2 using the “Sync with Main” action to ensure there are no conflicts. Since Main is up to date with Live from Step 1, there shouldn’t be any conflicts.
  4. Finally, merge development-2 into Main to get Main up to date with development-2. Once you are confident they are the same, you can go ahead and delete or sideline development-2 & remove the safety branch you created in Step 2.

Let me know if you have any questions

3 Likes