Commit f359db06 authored by intrigeri's avatar intrigeri
Browse files

Installer release process: merge the current remote branch.

… not a potentially obsolete local tracking branch.
parent ecd43311
......@@ -146,7 +146,7 @@ Merge Debian packaging changes:
if [ "${codename}" = "master" ]; then
fi && \
git merge "debian/${codename}"
git merge "debian/debian/${codename}"
Verify that `debian/gbp.conf` references the correct upstream and Debian (packaging) branches,
and that `pristine-tar` usage is enabled, e.g.:
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