Changes between Version 13 and Version 14 of StartModMaint


Ignore:
Timestamp:
Dec 10, 2013, 1:43:44 AM (9 years ago)
Author:
Beman Dawes
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • StartModMaint

    v13 v14  
    9393Since the bug is complex, it may take some time to fix and may go through several cycles of fixes, tests, and commits.
    9494
    95 So far, {{{bugfix/complex-boo-boo}}} is a private branch since it has not been pushed up to the public GitHub repo. To share work-in-progress with others, to create backup, or for any other reason make the branch public, just push it:
     95To share work-in-progress with others, to create backup, or for any other reason you want to make the branch public, just push it:
    9696
    9797{{{
     98git push --set-upstream origin bugfix/complex-boo-boo
     99}}}
     100
     101Whether or not {{{--set-upstream origin bugfix/complex-boo-boo}}} is actually needed depends on the {{{branch.autosetupmerge}}} configuration variable that isn't discussed here. If you don't supply {{{--set-upstream origin bugfix/complex-boo-boo}}} and it turns out to be needed, you will get an error message explaining that.
     102
     103Eventually you will fix the bug and do a final commit, and then it is time to merge the {{{bugfix/complex-boo-boo}}} branch back into {{{develop}}}:
     104
     105{{{
     106git checkout develop
     107git merge bugfix/complex-boo-boo
    98108git push
    99109}}}
    100110
    101 Now the branch is public and can be seen by others.
    102 
    103 Eventually the bug is fixed, so it is time to merge the {{{bugfix/complex-boo-boo}}} branch back into {{{develop}}}:
     111The usual practice is to delete temporary branches like {{{bugfix/complex-boo-boo}}} once they have been merged:
    104112
    105113{{{
     114git branch -d bugfix/complex-boo-boo
    106115}}}   
    107116 
    108117=== Start work on a new feature ===
    109118
    110 Simple bugs are usually fixed on the {{{develop}}} branch, at least in smaller projects. There is usually no need to first create a bug-fix branch. But git developers usually create a (possibly private) branch to work on new features, since development of new features on the development branch might leave it unstable for longer that expected.
     119Developers usually create a (possibly private) branch to work on new features, since development of new features on the development branch might leave it unstable for longer that expected.
    111120
    112121{{{