On: Resistance Against Git Merge Hell (2015)

[toast0]

In a system with production branches and staging, you build for staging from the production branch.

When you're in the release process, the branch won't match what's currently deployed, but that's ok. The point of a production branch is not to indicate what is on production at this instant, but to be a record of what was deployed to production or at least was intended to be, for changes that get canceled before deployment.

[Uvix → toast0]

Building for staging from the production branch would be fine. Grandparent explicitly said they build for staging from the dev branch, though.

[toast0 → Uvix]

Oh yeah. I missed that. Sounds like they use their staging for dev work too then. Which is like ok, but confusing.