Date: Fri, 07 Jun 1996 17:35:43 -0700 From: "Justin T. Gibbs" <gibbs@freefall.freebsd.org> To: Nate Williams <nate@sri.MT.net> Cc: "Jordan K. Hubbard" <jkh@time.cdrom.com>, hackers@freebsd.org (FreeBSD Hackers), freebsd-stable@freebsd.org (FreeBSD Stable Users), FreeBSD-current@freebsd.org (FreeBSD current users) Subject: Re: The -stable problem: my view Message-ID: <199606080035.RAA09150@freefall.freebsd.org> In-Reply-To: Your message of "Fri, 07 Jun 1996 17:06:47 MDT." <199606072306.RAA01251@rocky.sri.MT.net>
next in thread | previous in thread | raw e-mail | index | archive | help
>> 4. You go to do another merge into -stable and wind up with a whole *mess* >> of conflicts. `cvs update -j' is NOT a decent merge tool! > >I don't use 'cvs update -j' to merge it into -stable. 'merge' doesn't >work when you've already merged. What *I* do is this, which is a bit >more work but does do the job 95% of the time. Can't use use some "-r"'s with -j to make this work better? Granted you still have to look at the log file. >Nate -- Justin T. Gibbs =========================================== FreeBSD: Turning PCs into workstations ===========================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199606080035.RAA09150>