mysterious-glass-8673807/31/2019, 5:01 AM
Unfortunately, I get merge conflicts in my state file.You do not check in your state file. That is managed by app.pulumi.com by default, or you can manage it in cloud storage directly. app.pulumi.com additionally offers robust concurrency control around modifications, so only one of you can be changing the stack at a time.
We both develop against the localcopies of the stack file we have on our branches The most common approach here would be to create a fresh stack from the same project with your feature branch testing, and develop in that. Then, when you open a PR against your shared branch (
), have either CI/CD or a manual process do an update of the shared stack associated with that branch (
As a general rule, thinking of stacks as roughly 1:1 with "long lived branches" is a good starting point.
There's some notes on this topic at https://www.pulumi.com/docs/reference/cd/#using-branches-for-environments that may be helpful.
better-rainbow-1454907/31/2019, 10:15 AM