Difference between revisions of "Git Flow"
From GLMWiki
Redirect page
(Redirected page to The Great GLM Git Guide#Git Flow) |
|||
| (3 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
| + | #REDIRECT [[The Great GLM Git Guide#Git Flow]] | ||
| + | |||
[http://www.atlassian.com/git/workflows#!workflow-gitflow Git Flow Workflow] | [http://www.atlassian.com/git/workflows#!workflow-gitflow Git Flow Workflow] | ||
| Line 4: | Line 6: | ||
[http://nvie.com/posts/a-successful-git-branching-model/ A successful Git branching model] | [http://nvie.com/posts/a-successful-git-branching-model/ A successful Git branching model] | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
to start an project clone the git repo and initialize the git flow | to start an project clone the git repo and initialize the git flow | ||
| Line 47: | Line 38: | ||
== Cheat Sheets == | == Cheat Sheets == | ||
http://danielkummer.github.io/git-flow-cheatsheet/ | http://danielkummer.github.io/git-flow-cheatsheet/ | ||
| + | |||
| + | == When to use master == | ||
| + | For production code only | ||
| + | |||
| + | == When to use release == | ||
| + | Used for creating new releases of code from the develop branch (merges back into master and develop) | ||
== When to use develop == | == When to use develop == | ||
| Line 52: | Line 49: | ||
== When to use hotfix == | == When to use hotfix == | ||
| − | Use a hotfix for doing any small site updates like graphic changes or text changes. | + | Use a hotfix for doing any small site updates and maintenance like graphic changes or text changes. |
These changes are typically not considered | These changes are typically not considered | ||
