Anything wrong with merging branches today?

Viktor · 2025-02-05T18:42:36.803Z

Hi guys. Is there something wrong with merging branches today?

I need to merge my last branch to Main and then Deploy and it seems every time I try to, its merging Main to Main and shows no changes as shown in the image.

Screenshot_25-21802×691 53.6 KB

The branch in question has thousands of changes, including removed pages, plugins, and much more when compared to Main.

I tried relogging, cookies, cache, other browsers, restarting everything. It keeps doing that to multiple branches.

jacob20 · 2025-02-05T18:44:33.606Z

I’m running into a bug where I can’t sync changes from our main branch to a feature branch. Keep seeing this no matter what I do. Submitted a bug report a few minutes ago.

Screenshot 2025-02-05 at 11.44.11 AM744×654 37.5 KB

Viktor · 2025-02-10T16:57:12.213Z

were you able to resolve this? Or get any reply from support?
Its been days, I’ve reset all my devices, formatting PC etc

image906×432 88.6 KB

jacob20 · 2025-02-10T17:16:55.427Z

Yeah, apparently I had to sync my feature branch with live, which did the trick. No idea why I needed to do that. I’ve never had that be an issue before and it doesn’t really make sense. Waiting for a response from them about the root cause.

jacob20 · 2025-02-11T17:52:49.664Z

@Viktor also experiencing this in a different app today all of a sudden. Can’t merge a child feature branch into the parent feature branch. So annoying. Did you get this sorted on your end?

Viktor · 2025-02-11T21:18:22.191Z

jacob20:

Did you get this sorted on your end?

No solution yet. No reply from Bubble either

jacob20 · 2025-02-11T21:20:24.258Z

@Viktor Terrific

Viktor · 2025-02-11T21:40:22.519Z

Hey, just got this from support:
“Thank you so much for your continued patience. My name is Roody, and I’m happy to help!
I sincerely apologize for the delay in my reply as our team has been working through an influx of support requests.
Other users reported a similar behavior and were able to work around this by ensuring that both branches have the same plugins. Can you try adding the XXXX plugin to the Main branch to see if that allows you to merge with the (feature) branch?”

system · 2025-04-16T18:43:01.646Z

This topic was automatically closed after 70 days. New replies are no longer allowed.