> Using merge you also get a more accurate reflection of the project > history, i.e. you can see that the two branches were being developed > independently. Timestamps will be preserved so not all information is lost.. Marc