Commit ec81925e authored by Tails developers's avatar Tails developers
Browse files

Document that one should merge into experimental too.

parent ee505644
......@@ -22,9 +22,12 @@
On the Git side, merge the branch with `--no-ff` :
- for a new feature: into `devel`
- for a fix on top on the last RC: into `testing` and `devel`
- for a fix on top of the last stable: into `stable` and `devel`
- for a new feature: into `devel`; then merge `devel` into
`experimental`
- for a fix on top on the last RC: into `testing`; then merge
`testing` into `devel`, and `devel` into `experimental`
- for a fix on top of the last stable: into `stable`; then merge
`stable` into `devel`, and `devel` into `experimental`
On the APT repository side,
[[merge the suites|APT_repository#workflow-merge-topic-branch]].
......
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