Commit 824d0ced authored by intrigeri's avatar intrigeri
Browse files

Merge policy: move expectation to a better suited place

parent 4e77c178
......@@ -32,11 +32,6 @@ corresponding code changes, so that both get released together.
Regarding the [[FAQ|support/faq]], don't write new questions in advance but make sure that the
existing ones are still correct.
## Test your code
A branch proposed for review and merge must have been tested when applied
against the target branch(es) of the requested merge.
## Do not break the build... or get reverted
Do not push changes breaking the build into one of our [[main Git
......@@ -5,7 +5,8 @@ be named `feature/XXX`. For a bugfix about YYY, it should be named
`bugfix/YYY`. Ideally, include the relevant ticket number in the topic
branch name, e.g. `bugfix/7173-upgrade-syslinux`.
When you think it is good enough and have tested it, you have to:
When you think it is good enough and have tested your branch with its current
target branch (`config/base_branch`) merged into it:
1. Push your branch
- If you have commit access to the official Tails Git repository,
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