Re: Merge problem with WinCVS

2000-05-18 Thread Mark Derricutt
On Wed, 17 May 2000, Borrione Aldo wrote: > By the way, is it possible to integrate in WinCVS an external merge > tool ( such as AraxisMerge ) the same way it is possible to integrate > an external diff tool I installed AraxisMerge 2000 two days ago to test out, and frankly I'm impressed. I'm c

Merge problem with WinCVS

2000-05-17 Thread Borrione Aldo
Maybe this is a trivial matter, but here it is: We develop in WinCVS on the main trunk and say we arrive at ver 1.4 of file.c. Then we create a branch, named my_branch, and Team A starts working on it. As a result of this work, some lines are added, some are modified and some other are deleted