Commit aa640822 authored by intrigeri's avatar intrigeri
Browse files

Release process: don't assume the remove tracking branch is up-to-date.

parent 1f2124f5
......@@ -90,7 +90,7 @@ If we are at freeze time for a major release:
1. Merge the `master` Git branch into `devel`:
git checkout devel && git merge --no-ff origin/master
git checkout devel && git fetch origin && git merge --no-ff origin/master
2. [[Merge each APT overlay suite|APT_repository/custom#workflow-merge-overlays]]
listed in the `devel` branch's `config/APT_overlays.d/` into the `devel`
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