Changes between Version 4 and Version 5 of PostCvtMergePoint

Timestamp:

Dec 28, 2013, 4:29:52 PM (9 years ago)

Author:

Beman Dawes

Comment:

--

PostCvtMergePoint

@@ -16 +16 @@
 
 {{{
-cd modular-boost/libs/<my-library.
+cd modular-boost/libs/<my-library>
+git checkout develop
 git diff --name-status master..develop
 }}}
 
-gave me an overview on where the two branches differ; the same command without {{{--name-status}}} goes into more detail.
+gave me an overview on where the two branches differ; the same command without {{{--name-status}}} goes into more detail. {{{git checkout develop}}} is only needed if {{{develop}}} hasn't already been done. 
 
 (In principle, we all have kept our trunk and release branches in sync, so the above ought to have yielded nothing. In practice, however, all libraries likely had differences because (1) we sometimes forget to merge, (2) sometimes other people changed trunk and didn't merge and we didn't know, and (3) Stephen Kelly's Boost-wide changes were only on trunk.)