Commit 2211bac0 authored by French, Robert's avatar French, Robert
Browse files

Add example workflow in all its glory

parent 4de9efe7
......@@ -25,7 +25,27 @@ post by Jeff Kreeftmeijer:
* Releases are **tagged commits to master** (Everybody know [how to make a tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging#Annotated-Tags)?)
* Emergency Bugfixes (aka "hotfixes") go into `master` and `develop`
### Let's try some of this in practice:
1. `git clone git@code.ornl.gov:git-it-together/inspirational-quote-generator.git`
1. `git checkout -b develop`
1. `git checkout -b add-insipirational-limericks`
1. Add some excellent limericks
1. `git checkout develop; git merge add-inspirational-limericks`
1. `git checkout -b release-1.0`
1. Fix typos in limericks
1. `git checkout develop; git merge release-1.0`
1. `git checkout master; git merge release-1.0`
1. `git tag -a 1.0 -m "Add Inspirational Limericks"`
### Critiques of Git-Flow:
#### Too Complicated!
There are simpler workflows like what [GitHub uses internally](https://guides.github.com/introduction/flow/),
but they rely more on Continuous Integration, and may make for a more difficult
transition for teams that are accustomed to centralized version control tools.
\ No newline at end of file
transition for teams that are accustomed to centralized version control tools.
#### Needs Special tooling!
If you have to write extra tools on top of git, and effectively ask foks to fill
out a form every time they make a commit, you might be getting in the way of
development more than you are helping to organize it.
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment