Changes between Version 14 and Version 15 of StartModMaint


Ignore:
Timestamp:
Dec 10, 2013, 2:29:04 AM (9 years ago)
Author:
Beman Dawes
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • StartModMaint

    v14 v15  
    117117=== Start work on a new feature ===
    118118
    119 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 are encouraged to create a (possibly private) branch to work on new features, even simple ones, since development of new features on the {{{develop}}} branch might leave it unstable for longer that expected. Using the Git Flow convention, the branch will be named {{{feature/add-checksum-option}}} and {{{--track}}} is used instead of {{{-b}}} to ensure a public branch.
    120120
    121121{{{
    122 ... to be supplied ...
     122git checkout develop
     123git checkout -b feature/add-checksum-option
    123124}}}
    124125
    125 === Merge a completed feature branch to {{{develop}}} ===
     126The usual cycle of coding, testing, and commits then begins. If other work needs to be done, a {{{stash}}} or {{{commit}}} may be done to save work-in-progress, and the working copy switched to another branch for awhile. If significant fixes or other enhancements have been made to {{{develop}}} over time, it may be useful to merge {{{develop}}} into the feature branch so that the eventual merge back to {{{develop}}} has less conflicts. Here is how the merge from {{{develop}}} to {{{feature/add-checksum-option}}} is done:
    126127
    127 === Do a simple release ===
     128{{{
     129git checkout feature/add-checksum-option
     130git merge develop
     131}}}
    128132
    129 === Do a major release ===
     133== Merging to {{{master}}} for the First Time ==
    130134
    131 == Merging to Master for the First Time ==
    132 
    133 When you are ready to merge either the develop branch (or better a release branch that's forked off from develop), there's a bit of housekeeping to be done
     135When you are ready to merge either the develop branch, or better yet a release branch that's forked off from develop), there's a bit of housekeeping to be done
    134136the first time (assuming your library was originally in SVN) so that future merges proceed smoothly.  We're going to create a merge point between
    135137the develop and master branches so that Git knows the last point the two branches were in synch.  Once we've done that Git will perform a merge by
    … …  
    151153}}}
    152154
    153 Now create a merge to the specific commit above: since we don't really want to actually change the master branch we'll use the
     155Now create a merge to the specific commit above; since we don't really want to actually change the master branch we'll use the
    154156{{{-s ours}}} option to avoid any conflicts:
    155157