Changes between Version 26 and Version 27 of StartModMaint

Timestamp:

Dec 20, 2013, 12:46:39 PM (9 years ago)

Author:

Beman Dawes

Comment:

--

StartModMaint

@@ -156 +156 @@
 == 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
-the first time after the conversion from svn so that future merges proceed smoothly.  We're going to create a merge point between
-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].
-* 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].
-* 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}}}.
+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 the first time after the conversion from svn so that future merges proceed smoothly.  We're going to create a merge point between
+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].
+* 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].
+* 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}}}.
 
 Create a merge to that specific commit. Begin by changing your library to the master branch:
@@ -178 +170 @@
 }}}
 
-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 
-{{{-s ours}}} option to avoid any conflicts:
+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 {{{-s ours}}} option to avoid any conflicts:
 
 {{{
@@ -185 +176 @@
 }}}
 
-You can now use {{{git status}}} and {{{git diff}}} to check for modifications, in this case there are none.
-Now make the commit and push to !GitHub:
+You can now use {{{git status}}} and {{{git diff}}} to check for modifications, in this case there are none. Now make the commit and push to !GitHub:
 
 {{{