4 ms·

I mean, you could just checkout a new branch and push that, right?

• klodolph 9y ago
  Then it won't make it into production.
  • mikeyjk 9y ago
    - "submit your changes and go home" - "production" The merge should happen far before it hits production. Maybe I'm taking you too literally or something. Do you have a CI/CD pipeline?
    • klodolph 9y ago
      Workflow for the team I’m on right now: * Make changes * Run tests * Code review * Submit changes CI pipeline will run larger integration tests, make releases, and deploy to production. We can cherry pick commits to fix bugs at this point. The pipeline will roll out releases to the development environment on a nightly schedule and to production on a weekly using canaries. You can’t submit if your changes don’t merge cleanly. You’ll need to fix the changes and re-run tests (can be slow) at the minimum. If you don’t submit by end of Wednesday you have to wait another week.
      • qznc 9y ago
        Submit means "pushing to master" or "pushing feature branch"?
        • klodolph 9y ago
          Pushing to master. We don't really use feature branches here. New features are generally hidden behind flags, eventually enabled by default, and then the competing / legacy code paths are deleted.