Date: Thu, 08 Oct 1998 18:32:11 -0600 From: Warner Losh <imp@village.org> To: "Daniel O'Connor" <doconnor@gsoft.com.au> Cc: config@FreeBSD.ORG, Mike Smith <mike@smith.net.au> Subject: Re: Needed: intelisync-like functionality Message-ID: <199810090032.SAA07874@harmony.village.org> In-Reply-To: Your message of "Fri, 09 Oct 1998 09:51:43 %2B0930." <XFMail.981009095143.doconnor@gsoft.com.au> References: <XFMail.981009095143.doconnor@gsoft.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <XFMail.981009095143.doconnor@gsoft.com.au> "Daniel O'Connor" writes: : Well.. what about the way CVS does it? : It has to deal with this sort of thing.. (ie 2 people changing the same : piece of source) That's what I had in mind. However, with smarter conflict resolution, since CVS is brain dead about this for things like config files... Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-config" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199810090032.SAA07874>