Changes between Version 28 and Version 29 of StartModMaint

Timestamp:

Dec 20, 2013, 1:00:20 PM (9 years ago)

Author:

Beman Dawes

Comment:

--

StartModMaint

@@ -159 +159 @@
 the 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 replaying the commits on develop on top of master, starting from the last known merge: in other words Git will perform the tricky stuff of figuring out what to merge for us.
 
-* 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].
+* 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].
 * Look down through the commit history and make a note of the last merge in svn land. In our example, it was on October 25th 2013.
-* 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].
-* 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}}}.
+* 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].
+* 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}}}. Copy that SHA1 to your clipboard.
 
 Create a merge to that specific commit. Begin by changing your library to the master branch: