Merging (cont)
Who does the merges? Many approaches:
- Person checking in the code
- Project lead/admin
- Combination of both
Depends if developers are allowed to checkout/checkin on the target branch
If target/release branch is controlled:
- Administrator does automatic, or trival merges first
- Conflicts are resolved by the owners on their own branch