diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-12 22:34:34 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-12 22:50:09 +0300 |
| commit | 4377ba1c360cf6f4d15e3b5ad2a7ed7bc41f795e (patch) | |
| tree | 6ef31ceb6f50d1796cac2c790c0eedd7e8c4a000 /doc/release | |
| parent | 30cf916b263c187fe231acb6e622d21297092add (diff) | |
Use gitattribute merge=union to reduce CHANGELOG merge conflicts.
Diffstat (limited to 'doc/release')
| -rw-r--r-- | doc/release/monthly.md | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 12376d36a9a..c9e6d3426bc 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -87,20 +87,13 @@ asked if there is anything missing. There are three changelogs that need to be updated: CE, EE and CI. -Remove the Note text in the stable branches. - ## Create RC1 (CE, EE, CI) [Follow this How-to guide](howto_rc1.md) to create RC1. ## Prepare CHANGELOG for next release -Once the stable branches have been created, update the CHANGELOG in `master` with the upcoming version and add 70 empty -lines to it. We do this in order to avoid merge conflicts when merging the CHANGELOG. - -Make sure that the CHANGELOG im master contains the following disclaimer message: - -> Note: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases. +Once the stable branches have been created, update the CHANGELOG in `master` with the upcoming version. ## QA |