Changes between Version 12 and Version 13 of StartModMaint

Timestamp:

Dec 9, 2013, 8:46:27 PM (9 years ago)

Author:

Beman Dawes

Comment:

--

StartModMaint

@@ -83 +83 @@
 === Fix a bug using a bug-fix branch ===
 
-Fixing a bug directly on the {{{develop}}} branch is fine, if that's the policy for the library, but if the bug is messy, multiple maintainers are involved, interruptions are expected, or other complexities are present, then it is better practice to work on the bug in a separate bug-fix branch.
+Fixing a bug directly on the {{{develop}}} branch is fine, if that's the library's policy, but if the bug is messy, multiple maintainers are involved, interruptions are expected, or other complexities are present, then it is better practice to work on the bug in a separate bug-fix branch.
 
 {{{
-git checkout bugfix/complex-boo-boo
+git checkout -b bugfix/complex-boo-boo
 }}}
 
-This creates the branch {{{bugfix/complex-boo-boo}}}, and switches to it. Incidentally, "bugfix/" is part of the name, not a directory specifier. Because we were on branch {{{develop}}}, {{{develop}}} is what the new branch is based on. Since the bug is complex, it may take some time to fix, and the developer might go through several cycles of fixes, tests, and commits.
+This creates the branch {{{bugfix/complex-boo-boo}}}, and switches to it. Incidentally, {{{bugfix/}}} is part of the name, not a directory specifier. The new branch is based on branch {{{develop}}} because the working copy was on branch {{{develop}}} at the time of the branch.
 
-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 or to create backup:
+Since the bug is complex, it may take some time to fix and may go through several cycles of fixes, tests, and commits.
+
+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:
 
 {{{