Review

• Build the branch (or experimental) and test the feature.
• Check the diff e.g. with git log -p.
• Check the APT suite with ssh reprepro@incoming.deb.tails.boum.org reprepro list [bugfix|feature]-<name-with-dashes>
• Check the user and design documentation.
• Check the ticket.

Merge

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

On the APT repository side, merge the suites.

Book keeping

1. Update the QA Check field on the ticket. If there is no remaining tasks listed on the ticket, then change its status to Fix committed; else, ask the branch submitter to split the remaining tasks into other tickets.
2. Push the updated branch to the master Git repository.
3. If you merged into a branch that is built by our Jenkins, also push it to the Git repository on lizard (gitolite@git.puppet.tails.boum.org:tails).
4. Reply to the email that requested the review.