summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-03-16 16:06:38 +0000
committerintrigeri <intrigeri@boum.org>2018-03-16 16:06:38 +0000
commit78e2cf5de55035e3668f2cbd815b72b8e3a812cc (patch)
tree5839cfb1d1c359dbf5c64aaed03818f96c73cf34
parenta8a06b932b630411a52f0b482f9b313ca9520698 (diff)
Release process: ensure we merge something that's up-to-date.
-rw-r--r--wiki/src/contribute/release_process.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 5d6a0cf..be83d0d 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -130,7 +130,7 @@ If we are at freeze time for a point-release:
1. Merge the `master` Git branch into `stable`:
- git checkout stable && git merge --no-ff origin/master
+ git checkout stable && git fetch && git merge --no-ff origin/master
2. [[Merge each APT overlay suite|APT_repository/custom#workflow-merge-overlays]]
listed in the `stable` branch's `config/APT_overlays.d/` into the `stable`