summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-03-21 09:51:38 +0000
committerintrigeri <intrigeri@boum.org>2019-03-21 09:51:38 +0000
commit839c4dfdf8fe52c5b4d62060d3d1608fbfff02c7 (patch)
treec89e3f6e4fa99cce17a100cd4eca2066ea173773
parent1d475b0bc568dfb6d62bf1cab31910d8b5d8b30c (diff)
Release process: clarify valid, expected results (Closes: #16581)
When preparing a bugfix release, or when one has correctly resolved merged conflicts in the previous step, this operation is a no-op. That's fine. But let's keep it around as a fail-safe, in case a mistake was made during the merge conflict resolution previously.
-rw-r--r--wiki/src/contribute/release_process.mdwn3
1 files changed, 2 insertions, 1 deletions
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 0ffb217..55c88dc 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -278,7 +278,8 @@ Update other base branches
2. [[Thaw|APT_repository/time-based_snapshots#thaw]], on the devel
branch, the time-based APT repository snapshots that were used
- during the freeze.
+ during the freeze. It's fine if that results in a no-op
+ (it depends on how exactly previous operations were performed).
3. Merge `devel` into `feature/buster`, *without* following the instructions for
[[merging base branches|APT_repository/custom#workflow-merge-main-branch]].