Added quick description of how to merge branches back to the main trunk. For more detail, search the web for "cvs merge branch"
Added quick description of how to merge branches back to the main trunk.
For more detail, search the web for "cvs merge branch"

pyrovski/papi,pyrovski/papi,arm-hpc/papi,arm-hpc/papi,arm-hpc/papi,arm-hpc/papi,pyrovski/papi,pyrovski/papi,pyrovski/papi,pyrovski/papi,arm-hpc/papi,arm-hpc/papi,pyrovski/papi,pyrovski/papi,arm-hpc/papi