Changes between Version 25 and Version 26 of StartModMaint

Timestamp:

Dec 20, 2013, 12:42:41 PM (9 years ago)

Author:

Beman Dawes

Comment:

--

StartModMaint

@@ -154 +154 @@
 }}} 
 
-=== First post-svn conversion merge to {{{master}}} ===
+== First post-svn conversion merge to {{{master}}} ==
 
 When you are ready to merge the {{{develop}}} branch to {{{master}}} (or better yet a release branch that's branched off {{{master}}}), there's a bit of housekeeping to be done
@@ -162 +162 @@
 out what to merge for us.
 
-Begin by navigating to the history for your library on Github, starting with branch master, for example the Config library 
-[https://github.com/boostorg/config/commits/master can be seen here].  Looking down through the commit history we can see
-that the last merge (In SVN land) was on October 25th 2013: make a note of that date.  Now use the dropdown box to 
+* Navigate to the history for your library on Github, starting with branch master, for example the Config library 
+[https://github.com/boostorg/config/commits/master can be seen here].
+* Looking down through the commit history, see
+that the last merge (In SVN land) was on October 25th 2013: make a note of that date.
+* Use the dropdown box to 
 change the history to point to the develop branch, [https://github.com/boostorg/config/commits/develop Config library can be seen here].
-As you can see there have been several commits since the date above, the last before that date was on Oct 21st, click on the
-commit message for that change to take you to the actual diff for that change, [https://github.com/boostorg/config/commit/67f6b934f161dc5da2039004986a14d9217afae4 in our example here].  The SHA1 for that commit is shown below and to the right of the commit message, in this case it's 
+* Find the last commit '''before the date noted above'''. Click on the
+commit message for that commit to go to the actual diff for that change, [https://github.com/boostorg/config/commit/67f6b934f161dc5da2039004986a14d9217afae4 in our example here].  The SHA1 for that commit is shown below and to the right of the commit message, in this case it's 
 {{{67f6b934f161dc5da2039004986a14d9217afae4}}}.
 
-Now we'll create a merge to the specific commit, begin by changing your library to the master branch:
+Create a merge to that specific commit. Begin by changing your library to the master branch:
 
 {{{
@@ -184 +186 @@
 
 You can now use {{{git status}}} and {{{git diff}}} to check for modifications, in this case there are none.
-Now make the commit:
+Now make the commit and push to !GitHub:
 
 {{{
 git commit -am "Create first merge point for Git"
-}}}
-
-And finish off by pushing your changes to Github
-
-{{{
 git push
 }}}
 
 Then navigate to your libraries history again, and check that the merge shows up, [https://github.com/boostorg/config/commits/master our config example is here].
-You're now ready for "routine" merges to proceed as per Gitflow (or whatever other strategy you wish to use).
+You're now ready for "routine" merges to proceed as per Git Flow (or whatever other strategy you wish to use).
 
 === Lightweight library release ===