Commit 78e2cf5d authored by intrigeri's avatar intrigeri
Browse files

Release process: ensure we merge something that's up-to-date.

parent a8a06b93
......@@ -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`
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment