diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/git/branch.html | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dev/git/branch.html b/dev/git/branch.html index 30e8cc4..2db02a2 100644 --- a/dev/git/branch.html +++ b/dev/git/branch.html @@ -8,7 +8,6 @@ <a href="index.html">Git Index</a> - <h1>3. Git branches</h1> <p>Branches in git are "cheap" and easy, they allow to help maintain the information, both locally and remotely.</p> @@ -16,8 +15,8 @@ <h2 id="teamwork">3.1. Team workflow</h2> <p>This work flow is based on - <a href="http://nvie.com/posts/a-successful-git-branching-model/">Vicent Driessen</a> and <a href="http://www.bitsnbites.eu/a-stable-mainline-branching-model-for-git/">Marcus Geelnard</a> branch strategies, it defines rules how branches are forked, merged and tagged. By having well defined set i - of branches, the project structure is used as a communication + <a href="http://nvie.com/posts/a-successful-git-branching-model/">Vicent Driessen</a> and <a href="http://www.bitsnbites.eu/a-stable-mainline-branching-model-for-git/">Marcus Geelnard</a> branch strategies, it defines rules how branches are forked, merged and tagged. By having well defined set + of branches, the project structure is used as a communication tool, allowing to work simultaneously on different stages of the development.</p> <p>Main Branches;</p> @@ -75,7 +74,6 @@ <h3 id="feature">3.2. Feature</h3> <p>Create a branch featurex from develop and checkout;</p> - <pre> $ git checkout -b featurex develop </pre> @@ -240,7 +238,7 @@ <h3 id="hotfix">3.5. Hotfix</h3> - <p>Hotfix are done in master, the only exceptions are release and stable branches. When hot fix is applied to a stable branch is not included in future releases, only needed when cherry pick is hard or impossible. When hot fixes are don on release branches, as described on this document, they have short duration, hot fixes should relate only to new code. To create a hot/bug fix;</p> + <p>Hotfix are done in master, the only exceptions are release and stable branches. When hot fix is applied to a stable branch is not included in future releases, only needed when cherry pick is hard or impossible. When hot fixes are done on release branches, as described on this document, they have short duration, hot fixes should relate only to new code. To create a hot/bug fix;</p> <pre> $ git checkout -b h-error-name master |