Has anyone of you experience problems with merging branches?
I’m trying to merge a branch into my main branch. But when I do, only part of it is merged. The new data types are merged, but all the content in on the page doesn’t show up. I’ve retried it multiple times and the issue checker says there are no conflicts.
yes, if there are too many differences it seems to miss a lot. There will be no warnings and it looks like everything is good, but then when I want to deploy to prod, the issue notification lights up like a christmas tree. I haven’t found a pattern so it’s hard to get repeatable reproduction of the problem.
I don’t use them anymore, I just always try to have really small feature updates. In some cases, I’ll just use a feature toggle so I can always deploy but not have to release something that isn’t ready.
Bubble is currently investigating the issue and I’m contact with support. Interesting to hear that I’m not the only one experiencing this problem. I will keep you updated…
No, to be honest I was really disappointed in how Bubble handled the situation. It was clear that the branches were giving errors and that the unexpected behavior was a bug. The response that I received from them after hours of consult, was that I had to manually copy every change into the main branche….
Took me all night to make the deadline. They said the branches differed too much, but the actually differences wasn’t that big.
We’ve been facing merging issues recently (i.e. weeks ago) until now in merging branches to Main without conflicts. Our case is a little bit different than you. Actually, the merge process hangs at the last step with no response and when we refresh the page, we’re not sure what has been merged and what hasn’t so we restore to the save point before the merge and try again.
After contacting the support team, one of its members looked into the issue and told us that there is a problem with a specific backend workflow (we have no idea why) and that we have to click on this backend workflow or simply write a comment in it whenever the merge hangs and surprisingly that this solves our merge issue and it continues successfully.
It’s worth mentioning that we don’t modify this specific backend workflow however when we click on it, the merge issue is solved so this is just a workaround and we’re still waiting for a final solution.
So I believe in your case, it could be something like this and Bubble support team should be able to identify it.