Changes between Version 4 and Version 5 of DevelopmentWorkflow


Ignore:
Timestamp:
Jun 29, 2012, 4:40:52 PM (6 years ago)
Author:
planetcruiser
Comment:

offered two ways of bug fixing

Legend:

Unmodified
Added
Removed
Modified
  • DevelopmentWorkflow

    v4 v5  
    5656'''Important:''' Always push your commits for the current milestone to the develop branch.
    5757
     58=== Simple ===
     59
     60 1. Make sure you are on development branch and that it is up-to-date
     61{{{
     62git checkout develop
     63git pull
     64}}}
     65 1. Fix the issue..
     66 1. Commit the fix
     67{{{
     68git commit -a -m "Your commit message .. (Ticket #666)"
     69}}}
     70 1. Make sure branch is still up-to-date
     71{{{
     72git pull
     73}}}
     74 1. Push changes in develop branch to central repository
     75{{{
     76git push origin develop
     77}}}
     78
     79=== With bugfix branch (for complex fixes) ===
     80
    5881 1. Create a local topic branch
    5982{{{
     
    6386 1. Commit the fix
    6487{{{
    65 git commit -a -m "Your commit message .."
     88git commit -a -m "Your commit message .. (Ticket #666)"
    6689}}}
    6790 1. Merge fix into develop