Hi @ozanseymen, I am planning to use this repo setup for my sharedflows and proxies. I have the following branches: master, non-prod, prod.
I am using apigee deploy maven plugin to deploy them to APIGEE. I have 1 repo for each sharedflow.
I have the sharedflow common code in master. The only two files that are specific to an org and its environments are “parent-sharedflow-pom.xml” and “sharedflow/config.json”. I have created and added these two files to each branch (non-prod and prod) with org specific content.
When I make a feature branch and then merge to master, I am able to merge the changes to non-prod without overwriting the org specific files. If i have to merge the same changes from non-prod to prod, it will overwrite the two files also.
How do the files need to organized so that the code promotion from master → non-prod → prod works?