From 4b78d22e8c212d87a60f9ef3d4a8c97ea63ccf14 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Wed, 2 Feb 2022 10:03:19 -0700
Subject: [PATCH] release steps: fastforward main

---
 meta/releasing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/releasing.md b/meta/releasing.md
index e76ae60cd..64a01a958 100644
--- a/meta/releasing.md
+++ b/meta/releasing.md
@@ -41,7 +41,7 @@ release.
 5. Push the release branch and the tag.
 6. GitHub Actions will run its build steps. Wait until these are successful. If fixes
    need to be made to repair the pipeline or spec build, delete and re-tag the release.
-7. Check out `main`.
+7. Check out and fast-forward `main` to the release branch.
 8. Generate the changelog. This is done *after* the tagging to ensure the rendered
    changelog makes sense.
    1. Activate your python virtual environment.