Posted by diamondsea on April 4, 2016 at 3:55pm
We've been having workflow discussions at work.
We've been using the Gitflow model, but have been having discussions about eliminating all the branching overhead and having everybody commit directly to develop.
How do you all manage your workflow with multiple people using a repo, and how do you do your pushes to dev/test/stage/prod?
Curious to see how others in the area are doing it...
Comments
Version version version control, how I love theeeeee
This would be a great meetup topic. We're using a couple of different flows depending on the client. We do use branches and release branches. Acquia is big on release branches and tags. One of our biggest issues is when two different developers modify the same file and commit it to their own branches then when they push to the release branch we get conflicts.
Some things I've learned:
- Always push forward, never push backward.
- Devs never touch master, they should not even see it.
- Tag often. Tags save your a**
If devs are merging Develop
If devs are merging Develop into their branches before committing, you can avoid the conflicts on merge.
What do you mean by "Always push forward, never push backward." ?