Path: utzoo!utgpu!jarvis.csri.toronto.edu!rutgers!apple!bionet!ig!ames!ncar!boulder!ccncsu!olender From: olender@cs.colostate.edu (Kurt Olender) Newsgroups: comp.software-eng Subject: Re: Source Code Control Message-ID: Date: 5 Jul 89 17:56:50 GMT References: <133@tirnan.UUCP> <9630003@hpirs.HP.COM> <3777@orca.WV.TEK.COM> Sender: news@ccncsu.ColoState.EDU Organization: Colorado State University, Fort Collins, CO 80525 Lines: 26 In-reply-to: stank@anvil.WV.TEK.COM's message of 5 Jul 89 01:34:56 GMT In article <3777@orca.WV.TEK.COM> stank@anvil.WV.TEK.COM (Stan Kalinowski) writes: In article <9630003@hpirs.HP.COM> runyan@hpirs.HP.COM (Mark Runyan) writes: >If NSE solves this problem to handle the merge automatically, I'd like >to know how its done. (Of course, it may be a company secret for SUN, Sun's NSE does not handle the merge problem automatically when there is a conflict between two versions (i. e. they modify the same section of code). It does provide a window-based tool to help a user reconcile the conflicts. BTW, the source of my information is a reasonably detailed technical report published by Sun that describes the features of and tools included in NSE. I'm not sure where it came from, since it was routed to me from others, but it is likely that it would be available through a Sun sales rep, since it is intended for potential buyers of NSE. The citation is "The Network Software Environment", William Courington, Sun Microsystems, Inc., April 1989. From the back page, I suspect the part number is FE197-0/20K, but I wouldn't bet my next paycheck on it. -- ============================================================================ || Kurt Olender | Internet: olender@cs.colostate.edu || || Phone: (303) 491-7015 | UUCP: hao!handel!olender || ============================================================================