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.
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.
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.
@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?
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?”