News for hackers. Stuff that matters.
Re:Please stop recommending Gitflow by westoque on Wednesday March 04, 2020 @11:43PM (#22491039)
The fact is that this doesn't work for everyone. What we found to be most workable is master is always "stable", then we have a production branch that is cut from master.

This gives you a few things:

1. More predictable deployments (let's deploy every week with X items)

2. Better rollbacks (rollback to last production deploy instead of guessing SHA1 of last acceptable state)

Re:Please stop recommending Gitflow by debaserab2 on Thursday March 05, 2020 @01:16AM (#22491361)
This is what I use tags for.

Master = deployable state (stable)

Every deploy gets a tag (named with its version). Rollback to previous tag in event of failure. Deployments remain just as predictable.

Re:Please stop recommending Gitflow by mikekchar on Thursday March 05, 2020 @02:11AM (#22491568)
I've also seen people have a single development branch and multiple release branches (imagine a 'devel' branch that everyone merges into and a branch for each release that you have, and that potentially merges back into devel if you do hot patches). It's essentially the same thing -- branches aren't really all that different than tags in git.
Re:Please stop recommending Gitflow by debaserab2 on Thursday March 05, 2020 @03:20PM (#22497713)
Yeah its basically aesthetics. I do like keeping the release identifier separate from branches though just for categorization purposes (branches = development, tags = releases)
Re:Please stop recommending Gitflow by gardnr on Thursday March 05, 2020 @12:43AM (#22491247)
The method you describe is functionally the same and only nominally different.

It could be said:

> What we found to be most workable is develop is always "stable", then we deploy from master.

Re:Please stop recommending Gitflow by simplyinfinity on Thursday March 05, 2020 @06:04AM (#22492559)
we deploy to test multiple times a day from out master branch after a Pull request is reviewed & merged. the deployment bundle (zip of the state of the code) that goes to test later goes to staging and production is the same across environments.

The only thing that changes is the configuration variables which are replaced at each env. This ensures predictable deployments and if we want to rollback we just pick the last release bundle and re-deploy that.

Re:Please stop recommending Gitflow by bfung on Thursday March 05, 2020 @12:07AM (#22491120)
My snarky version of this is: ideally head of master is deployable (no regressions, yadda yadda). In reality, how many times has head master of master been broken and one had to rollback, and then had to scramble to find the rollback?

Gitflow is fine - better to use it (w/the girl extension) than spend time arguing branches.

Re:Please stop recommending Gitflow by legulere on Thursday March 05, 2020 @12:44AM (#22491248)
Having to frequently rollback changes can be argued to mean that you don’t do enough testing before merging but are testing in production.