diff --git a/MapnikReleaseSteps.md b/MapnikReleaseSteps.md index 26914d5..236356e 100644 --- a/MapnikReleaseSteps.md +++ b/MapnikReleaseSteps.md @@ -104,6 +104,14 @@ If the `make test-release` build works then go to https://github.com/mapnik/mapn * If there are new styling or datasource options, create a new `mapnik-reference` entry for the release: https://github.com/mapnik/mapnik-reference * Update master branches entries in [CHANGELOG](https://github.com/mapnik/mapnik/blob/master/CHANGELOG.md) from the new release (if relevant, e.g. if you are tagging and releasing a stable release not from the master branch). +For example to sync up master [CHANGELOG](https://github.com/mapnik/mapnik/blob/master/CHANGELOG.md) with `v3.0.x` branch: + +``` +git checkout master +git checkout --patch v3.0.x CHANGELOG.md +git commit -v +git push origin master +``` If this was a major release and a stable series is likely, now branch it, for example a `2.1.0` release would warrant an immediate `2.1.x` branch for a stable series of bugfix releases.