Hey looking for some advice on how to manage our Odoo development. We use a GitFlow-Topic workflow in our organization.

We currently have three repos:

[GitLab]Development: org/devgold
[Odoo.sh/GitHub]Production: org/Production
[Odoo.sh/GitHub]Development: org/Development

We are having some issues in this setup. Odoo.sh wants to be both a repository branch and an environment. Our production environment is locked down (i.e., Developers cannot access it). Thus we have a separate odoo.sh environment for development and test.

Scenario: So I have a production environment (Prod/master) running v1.0. This image is cloned at our company's gitlab repo (i.e., devgold).

We have a hotfix that is branched from devgold -> maint1.0 -> hotfix 210728. I want to validate that in the org/Development/staging environment prior to releasing it to org/Production/master.

1) What is the best way to do this in Odoo.sh?
2) How do I overwrite a staging environment with a branch from another repo (i.e., not a branch in this repo)?
3) How do I rest a branch to the base Odoo image?

Currently I revert the git repo to the first commit (not ideal) and merge with the pull from devgold/maint/hotfix branch. This is quite combersome. I would simply like to go into an environment (e.g., org/Development/staging and do a git clone of the org/Git

How do you all move code & data around Odoo.sh projects (environments)?

Best,
Jon