holman / ama

Ask @holman anything!
732 stars 278 forks source link

Multiple environments and git branches #770

Closed jmarcos-cano closed 8 years ago

jmarcos-cano commented 8 years ago

hello, we are currently struggling with this:

  1. FeatureBranches : we are under scrum so each user story is a new branch, this usually matches local development environment
  2. dev branch: this usually reflects a DEV server with fake data, etc etc. we open a merge request to master if everything goes well at DEV servers.
  3. master branch : this reflects a user acceptance testing (UAT) environment and automated regression testing suite with the data just as in production.
  4. once everything goes well and the products accepts everything we can trigger a button to generate the STAGING infrastructure from master branch

however i do see a lot of problems with these approach and the first and more evident is that master is not always healthy because if FBranch-1 comes unhealhty and reaches master and FBranch-2 is healthy then we can not ship FBranch-2

so how you guys manage environments VS git branches?

PS: i guess that our first problem is the "cascade" approach from the git branching model