Skip to content
Snippets Groups Projects

Changes

Page history
  • New page
  • Templates
    • Updated Git Workflow (markdown) authored by Alvise de'Faveri's avatar Alvise de'Faveri
    Show whitespace changes
    Inline Side-by-side
    Showing
    with 2 additions and 2 deletions
    Git-Workflow.md
    View page @ 92be3b85
    ...@@ -15,10 +15,10 @@ Ideally, branches should be divided in these categories: ...@@ -15,10 +15,10 @@ Ideally, branches should be divided in these categories:
    - `master` branch: is the final one: everything's that here has been tested and it's all working. - `master` branch: is the final one: everything's that here has been tested and it's all working.
    - `testing` branch: is where development takes places: when a new feature is ready, it has to work with - `testing` branch: is where development takes places: when a new feature is ready, it has to work with
    the rest of the code and then, only when everything's working, it can be merged with the master. the rest of the code and then, only when everything's working, it can be merged with the master.
    - Feature branches: they exist for a limited amount of time for developing a specific feature. When the feature is ready, - `feature` branches: they exist for a limited amount of time for developing a specific feature. When the feature is ready,
    a *Pull Request* will be opened to merge the feature branch with the testing one, where it will be tested with a *Pull Request* will be opened to merge the feature branch with the testing one, where it will be tested with
    all the other features that maybe were added in the meantime. If the Request is accepted, you can cancel the feature brench. all the other features that maybe were added in the meantime. If the Request is accepted, you can cancel the feature brench.
    - Hotfix branches: normally, when a bug is found on the master, a branch is created to find a fix to that bug. - `hotfix` branches: normally, when a bug is found on the master, a branch is created to find a fix to that bug.
    When the problem is solved, the branch will be merged with the master *and* the testing branch before being cancelled. When the problem is solved, the branch will be merged with the master *and* the testing branch before being cancelled.
    If you want to see a nice branching model example take a look at <http://nvie.com/posts/a-successful-git-branching-model/>. If you want to see a nice branching model example take a look at <http://nvie.com/posts/a-successful-git-branching-model/>.
    ......