Changes between Version 6 and Version 7 of StartModMaint

Timestamp:

Dec 7, 2013, 6:37:15 PM (9 years ago)

Author:

John Maddock

Comment:

--

StartModMaint

@@ -67 +67 @@
 }}}
 
+== Merging to Master for the First Time ==
+
+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
+the first time (assuming your library was originally in 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.
+
+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 
+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 
+{{{67f6b934f161dc5da2039004986a14d9217afae4}}}.
+
+Now we'll create a merge to the specific commit, begin by changing your library to the master branch:
+
+{{{
+git checkout master
+}}}
+
+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:
+
+{{{
+git merge --no-ff --no-commit -s ours 67f6b934f161dc5da2039004986a14d9217afae4
+}}}
+
+You can now use {{{git status}}} and {{{git diff}}} to check for modifications, in this case there are none.
+Now make the commit:
+
+{{{
+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).