Changes between Version 3 and Version 4 of PostCvtMergePoint
- Timestamp:
- Dec 28, 2013, 4:20:17 PM (9 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
PostCvtMergePoint
v3 v4 30 30 What made it more interesting for me is that I sometimes didn't want a commit to be part of the initial state, so I reverted it using {{{git revert}}} instead of applying it to the other branch using {{{git cherry-pick}}}; but this should probably not be needed most of the time. 31 31 32 The final result of all that cherry picking should be a state in which {{{git diff master..develop}}} doesn't report any differences. Once there, things are a simple merge away, as described below. 32 The final result of all that cherry picking should be a state in which {{{git diff master..develop}}} doesn't report any differences. Once there, things are a simple merge away, as described below. 33 33 34 34 == Step-by-step == 35 36 Remember to do a {{{git push}}} if the preparation left any non-pushed commits. 35 37 36 38 * 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].
