I have a tool that uses an old source code management with a staging concept:
1. Dev
2. Test
3. Production
Modifing an element (a file) moves it to the dev-stage and will be stored there. It has to be moved by the developer through test in production. The "move"-operation is kind of a copy to the next stage. There, it cannot be modified anymore.
Each stage has its own targets for deployment.
Now, I try to replace this source code manager with git without changing the tool to much. So I am looking for a branching model with a similar concept. My plan ist to have following branches:
1. env/dev
2. env/test
3. env/prod
Each branch is used for deployment to the same targets as the stages used to be. However, I am not sure how to move single elements between branches without merging a commit (with multiple changes) to the next branch.
Is it possible to pick single files from a commit and to commit it to another branch?
Is git cherry-pick the correct way?
Do I have to make sure, that every commit contains just one file?
