Hello,
What is the best flow to manage code form FF (flutterflow branch) and custom code from IDE (develop branch) ?
I follow this but not good for my case (PR with conflicts) : https://docs.flutterflow.io/customizing-your-app/manage-custom-code-in-github#the-flow
If I made a Pull Request from "flutterflow" to "develop" and I have conflicts and resolve, GitHub made an automatic push in "flutterflow" branch to apply conflicts resolution. But later with a new PR, it is difficult to manage code between branches, old dependencies and old code come back from flutterflow branch and merge in develop branch.
The "automatic" commit after conflicts resolution :
For the moment, I will avoid to make PR and just compare manually diff between "develop" and "flutterflow". It is the good practice ?
And second question, why is it not possible to deploy From The Main Branch like in the official documentation ? Do we need to deploy Main on other platform like Vercel ? https://docs.flutterflow.io/customizing-your-app/manage-custom-code-in-github#id-9.-deploy-from-the-main-branch
I have Pro Plan $600 by year with "GitHub Integration", OK it is a good product but sometimes need help 🙄
Thx a lot.