Sorry to be snarky @nick.carroll but I stopped reporting editor Bugs when you stopped fixing them.
This was a “down” tree. The merge back “down” from a Hotfix to Main doesn’t work very well.
I had, rather stupidly, assumed that enough people would have used the new VC by now to have ironed out the kinks.
Think I have gone to early on this, sadly. I have no time to test stuff for Bubble .
Nah, definitely broken.
Just had some merge conflicts (out of the blue) from Main to Branch. Selected to use the ones from Main (as they were correct) and they DID NOT get merged into the branch.
Had to recreate the branch from scratch.
Which is now impossible. As my previous version (version-qa) is now called version-12dr.
WTF.
Why can’t I call my branches whatever I want???
Why would you do this? If I ever need to re-create a branch I have to give the new URL to the testers?
Why? This is stupid.
Branch names need to be unique for them to function properly, so we moved to unique IDs for branches to ensure uniqueness, but to also allow users to select whatever display name they would like for their branch.
Several users have provided the feedback that this is slowing down their development flows so its definitely on our radar. There may be an opportunity to allow users to specify a slug for their branch (to remain consistent in the URL) - but this required more work than was expected to implement, so we did not want to hold up the release of the new version control for that feature alone.
Its all good, I’m frustrated by the bugs too. We are definitely in a “if a tree falls in a forest, and no one is there to hear it…” type situation with many Editor bugs though. As we work on improving our internal QA processes, bug reports (especially for high priority & sensitive features like version control) are critical to addressing issues in the wild.
I can assure you, we did not invest a year in rebuilding version control to not solve previous pain points and to not resolve any bugs that may arise in a prompt manner.
It is, without doubt, orders of magnitude better than the old one 
I’m struggling with this and want to make sure I am using it right.
I made a branch to integrate a new plugin. After I got it working right, I “Synced with Main”
After the Sync, I should see all of the changed I made in the branch reflected in Main right?
Right now, that is not happening, but want to rule out user error before I report the bug.
Not quite - syncing with Main will bring changes from Main into your branch. To get your changes from your branch into Main, navigate to the Main branch and “merge changes from another branch”. This will open up the merge flow which starts with a step to select the branch with the changes you want to add into your Main branch.
Let me know if you have any issues bringing those changes in.
Ahhhh, but you didn’t
You kept the old names when we swapped to the new version control system. So qa was still qa.
Any NEW branches have unique names.
Is there a difference between going into a Branch and doing “Sync With Main” and doing “Merge changes from another Branch” and chosing Main.
There are two scenrios here.
-
I have a QA branch with some custom changes that I want to keep, but merge in new changes from Main.
-
I want to make a “clean” copy of Main in QA. No merging, no conflicts, just “make this a copy of main”.
This was ONE hotfix change being copied down from Live. All I did was remove the password protection from Live.
It has now been trying to merge for 10 minutes.
Not great.
When working with Hotfix, which requires us to be in the Live version of the app, the app data should be the same as the Live version app data. My clients often bring my attention to issues using live data, and when I am putting in a hotfix, I am looking at the app data to confirm, but the data is not the same as the Live Version.
Yeah, Hotfix is a ‘paused’ Dev.
So you can test out your change there and deploy. And then test in Live.
Exciting stuff 
Would you guys mind making the text clickable, too?
Okay, so because it’s a paused dev version the app data I see is dev version app data.
That makes sense. Guess I gotta continue to use two tabs, one live version so I can see the app data and the other the hot fix so I can make the necessary changes.
Yeah, I think it makes some sense. Would love to be able to test “as if we were in Live” as those pesky Uses can create some fun data
I’m personally not trying to test if my hot fix works.
I’m needing to reference live data to see what went wrong so I can implement a fix. Just want to view existing live data.
Agreed that this is terrible. Updated API connector messages are being worked on.
Correct, Main is the only branch that can be deployed to live (outside of a hotfix branch)
A flow that seems to work well is to create a feature branch, make changes, create a QA branch off of Main, merge that feature branch into the QA branch and test, and then merge QA into Main when it is ready to be deployed.