I worked on a feature branch to add some functionality to my app. I finished working on this branch (KT-360) and now when trying to merge to main (KT-360 -> main), FlutterFlow wants to remove all the changes I made in my feature branch. It does not recognize the new code it seems, as the "Merged View" does not include the new code in the feature branch (KT-360).
I worked on many changes so manually going item by item could take me days. It's the first time I'm using the branching feature in FlutterFlow to add best practices to my development efforts but now I'm afraid I may lose all the work I put in.
Any suggestions?