Check out the svn book; specifically, the merging section.
I did. How do you think I got the lame merge command I used.
Do I need to do the merge on the specific files? The book indicated that if I did it on the specific versions, the changes associated with the versions would be merged. Well, nuttin.
So, clearly I'm doing something wrong, even after RTFM.
-- David N. Lombard Rossmoor, Orange County, CA http://www.fourmilab.ch/cgi-bin/uncgi/Earth?imgsize=320&opt=-z&lat=33.8&ns=North&lon=118.08&ew=West&alt=7&img=learth.evif
------------------------------------------------------- This SF.Net email is sponsored by: Sybase ASE Linux Express Edition - download now for FREE LinuxWorld Reader's Choice Award Winner for best database on Linux. http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click _______________________________________________ Oscar-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/oscar-devel
