Hi @Tatsiana_Shurakova! Thanks for reaching out.
This is definitely something that we are planning to address in the relatively near future, as it's not well supported using the existing tools. It is possible, though, using a combination of the approaches that you've described above.
The recommended strategy is to merge main into feature directly through GitHub and then use the "Reset Branch" option within Retool to sync the remote feature branch with the local version!
It's not super intuitive, but that should do the trick. Let me know if you have any questions!