Network team merge process, setup instructions, and notes.
This page explains how to merge patches into Tor. For the rules about **when** to merge patches into Tor, see the [[org/teams/NetworkTeam/MergePolicy|MergePolicy]] document.
This page explains how to merge patches into Tor. For the rules about **when** to merge patches into Tor, see the [MergePolicy](./MergePolicy) document.
...
...
@@ -32,7 +32,7 @@ You might find it easier to use a separate git repository for merges and regular
**Automatic Setup**
Set TOR_FULL_GIT_PATH in your .profile, and run `git-setup-dirs.sh`.
(This script sets up backport worktrees as well - you can just ignore them.)
(This script sets up backport worktrees as well: you can just ignore them.)
