TODO: Describe merging here. This will reference the tasks page on branching.
Maintaining branches with Subclipse