A tiny UI issue?
I ran into something similar myself. And this when there was no conflict and nothing to sync. I had made just one small option-set change in the branch and except that there was no difference between Main and branch. But I clicked on “Sync with Main” just in case, and this…
Is this a bug or a feature? I can’t see the history of any of my branches. My plan says that I can only restore up to 14 days ago – I get that. But not allow me to see the history? This must be a bug, right?
Are your branches still Archived?
Are you still missing the branch history?
Ooops, I missed this message. Yes, some branches are archived and don’t show here. What’s weird is that both Live and Main show very little history. Is there a limit of how far back the history shows depending on the App plan?
History should still be seen outside of your retention windows. Please file a bug report if its not showing up - thank you!
@samnichols I’m not sure I fully understand your question, what do you mean by 2nd dev environment?
I desperately need the way to compare two branches (of which one should be main or live too) on exact differences in two branches and to be able to selectively merge things between the two.
I don’t know how are others functioning without these features.
In absence of this I am simply having branch for my junior developer to work on, and then I copy paste the parts from his branch to mine.
And also there is no access control on the branches. So if he accidentally works on Main branch none of us know what damage has been caused.
Great feedback, thanks @mghatiya. These are all features on the version control roadmap.
The foundation to these features is the branch changelog, which will be the next VC release. While it is not touching branch permissions, it will make it possible to know at a glance who changed what & when.
Diffs & Commits (the ability to merge more granular changes) are things that will come down the road - no timeline on that yet, unfortunately.
Thanks @nick.carroll for the response and good to know that these things are in your radar and roadmap.
Frankly without the ability to see diff and selectively merge, the merge feature is as good as non-existent to me. I just use the branch feature to reduce the risk of other developer causing some damage. I do not use ‘merge’ at all.
@mghatiya, what’s your work around then?
This is scary. It seems there’s no way to prevent, or even know of, the following:
- Developer accidentally working on Main.
- Developer shipping bugs to main
@brad.h I am not aware of any workaround. I just work in praying mode all the time hoping that developers will be working in right branches.
And with no way to compare difference in two branches or selectively merge, the version control to put mildly is a joke right now.
lol. Well bubble has Change Log as the top item for “what’s next?” in the version control blog post dated March 2023. Hopefully this is coming soon!
There is a way to do this. There’s an entire step called “review changes”.
How to find it?
@nick.carroll had earlier confirmed in this post that there is no way to do that right now.
I think it’s newer. When you merge from another branch it’s the first step (image below). It actually forces you to review changes and accept them. You can’t avoid it…which is great.
Link to bubble docs on “Review Changes”
You can click into each change and review. It works very well…I’ve tested tiny changes, WF changes, backend changes, etc and it seems to handle them well. I’m just starting to mess around tho. Maybe there’s limitations? But it seems exactly what you need.