Introducing Bubble’s New Version Control

Announcements
82

I don’t think the personal plan had multiple versions before either, so welcome to the party

83

Great, it works. Could you add the same behavior to the Components panel?

84

Glad to see bubble shaping up as a Full fledged, software dev tool, with all these developer loved perks!

85

Adding my seconds to this - I think it would be nice to even have just one more branch on the personal plan

86

@nick.carroll
I recently delete a branch, and want to recreate a branch, which named as same as the deleted one, but I can’t with error(The branch name is already used)

Is it impossible to name a new branch even if I have already deleted ?

87

We recently signed up for the Professional plan and are using the branch feature.

We are not convinced that the Professional plan has a limit of 2 branches and the new Growth plan allows up to 10.

We are disappointed with this announcement as we thought the Professional plan would automatically migrate to the Growth plan.

We would like to consider moving to the Growth plan even if we have to pay the difference, can we inquire?

88

If you are on new version control, this is a bug. You should be able to use the same name for a branch as one that has been previously deleted.

Do you mind filing a bug report?

89

Hi! You should be able to move your app from Professional to the new Growth plan by navigating to Settings > App Plan and selecting the new Growth plan when upgrading your apps plan. Let me know if you have any issues

90

@nick.carroll

Not sure if this is bug.

Copied three “on page load” workflows up from Main into a Hotfix. All good.

Then synced Live back to Main.

It did not recognise the steps from Live as identical (although I have seen it do this before) and so duplicated every step.

image
image880×450 26.1 KB

91

I have 2 branches:

  • Main development
  • Another branch for test
    I NEED to keep these 2 separated. I am currently blocked to work properly. How can I come back to the former branch manager?
92

Do you mind sharing a bit more about how you are currently blocked? Depending on your plan, you should have at least 1 more branch for development. This branch can be created from Main or from your test branch for any development work.

93

Hi @nick.carroll, My entire app is built in development-2 (not the main branch). I’ve been stuck there since 2020 (Bug report #8967) because of the known version sync issues.

@nick.carroll Should I bet my life’s work that there will be no issues?

I have three years of development work without ever syncing to main.

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

95

@nick.carroll I’m going this route.

I think there will be conflicts. Right?

Main will look just like live. And since development-2 contains changes not yet in live, there will be conflicts here.

P.S. - I did steps 1 and 2 and it seems OK so far. Thank god…I’m scared.

96

So conflicts will only arise when something has been changed in different ways in two different branches - so it should be unlikely if the last deploy was made from development-2 But if there are, you’ll have the opportunity to preview what the conflict looks like if its resolved either way to help you make the right choice

97

Ok @nick.carroll I followed your directions and this seems to have worked perfectly.

I’m still cautious of sync issue. However, I’m very impressed with step three which is used as a double check for syncing issues.

I’ll report back later, but if there’s no issues this update might be such a big deal. In a good way.

thanks Nick!

98

Thats great to hear! Let me know how it goes.

99

You should be.

Am not sure it really works as well as they think it does.

As in…I have already broken the sync.

Unsurprisingly.

100

@NigelG , Have you tried using a “down tree” merge to verify conflict before pushing “up tree”. It seems like a built in way to audit for sync issues.

It was Nicks recommendation (below) and seems legit.

It took me a while to understand how this audit works. This video is the best resource. The 2min mark is where it goes into the mini audit performed by bubble.

Thanks for sharing that there’s still sync issues. I had to manually go over each workflow and condition back in April of 2020 when I trusted the sync. It took me months of work to get it right…bubble helped me go over each item manually as well. This was honestly horrible…I couldn’t sleep.

I think transparency is the most important thing here. I hope others document sync issues in this forum. I think bubble should also post known issues in the docs (like they did in the past) to avoid major issues.

101

Hey Nigel - have you filed a bug report for the issue you encountered merging?