Commit 743b397f authored by intrigeri's avatar intrigeri
Browse files

Release process: document changelog merging

refs #17577
parent f1fef0ef
......@@ -247,6 +247,11 @@ operation must be done on the APT suites.
1. Merge in Git and APT:
<div class="note">
If you have to resolve a merge conflict in <code>debian/changelog</code>,
ensure only the latest <code>UNRELEASED</code> entry is present.
git checkout "$DST" && \
git merge "origin/$DST" && \
git merge "$SRC" && \
Markdown is supported
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