Merging the trunk into your branch Before you can merge your branch back into the trunk, you have to bring the latest updates from the trunk back into your branch. This is also useful if you know there are updates in the trunk that you wish to make use of in your branch. Carefully placed tags are used to mark these merges for future reference. HEAD Take care of any conflicts, build and test your branched working copy. Add incremental scheduling for better partial-state management.
Implement caps negotiation between pads.