On Friday 29 November 2002 09:01 am, Gerard van Enk wrote: > Rob van Maris wrote: > > Apologies accepted... > > > > Regarding the CVS questions, I don't want to give a lecture on it here, > > as good documentation is already available online. > > The CVS manual, particularly the chapter I referred to, has all the > > answers. > > The cvsbook is also very good <http://cvsbook.red-bean.com/> I wil look into that. After reading the first manual again I cam to the same conculsion as the first post (just do a cvs update -j HEAD MyFile.java or maybe cvs update -kk -j HEAD MyFile.java ). If that doesn't work/compile you might want to use a graphical merge client or do the changes by hand.
greets
