Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
aa640822
Commit
aa640822
authored
Aug 16, 2018
by
intrigeri
Browse files
Release process: don't assume the remove tracking branch is up-to-date.
parent
1f2124f5
Changes
1
Show whitespace changes
Inline
Side-by-side
wiki/src/contribute/release_process.mdwn
View file @
aa640822
...
...
@@ -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`
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment