Date: Tue, 25 Jul 1995 20:11:38 -0700 From: "Jordan K. Hubbard" <jkh@time.cdrom.com> To: "Rodney W. Grimes" <rgrimes@gndrsh.aac.dev.com> Cc: jkh@freefall.cdrom.com (Jordan K. Hubbard), CVS-commiters@freefall.cdrom.com, cvs-user@freefall.cdrom.com Subject: Re: cvs commit: src/release Makefile Message-ID: <23033.806728298@time.cdrom.com> In-Reply-To: Your message of "Tue, 25 Jul 1995 20:04:23 PDT." <199507260304.UAA23544@gndrsh.aac.dev.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> I thought that we had agreed that src/release would only be worked on in > _one_ branch until 2.1 src/release was done and working to your satisfaction > and I had merged the changes back into 2.2. > > This has just created a merge conflict that will have to be delt with :-(. Argh. Well, it's proving to be an unworkable "solution" then since I need folks like Mark to be able to look over my proposed changes and -current is a very convenient place for this. We need to figure out something else. This isn't going to work. Jordan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?23033.806728298>