From owner-cvs-user  Tue Jul 25 20:12:43 1995
Return-Path: cvs-user-owner
Received: (from majordom@localhost)
          by freefall.cdrom.com (8.6.11/8.6.6) id UAA00802
          for cvs-user-outgoing; Tue, 25 Jul 1995 20:12:43 -0700
Received: from time.cdrom.com (time.cdrom.com [192.216.222.226])
          by freefall.cdrom.com (8.6.11/8.6.6) with ESMTP id UAA00793
          ; Tue, 25 Jul 1995 20:12:36 -0700
Received: from localhost (localhost [127.0.0.1]) by time.cdrom.com (8.6.11/8.6.9) with SMTP id UAA23037; Tue, 25 Jul 1995 20:11:39 -0700
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 
In-reply-to: Your message of "Tue, 25 Jul 1995 20:04:23 PDT."
             <199507260304.UAA23544@gndrsh.aac.dev.com> 
Date: Tue, 25 Jul 1995 20:11:38 -0700
Message-ID: <23033.806728298@time.cdrom.com>
From: "Jordan K. Hubbard" <jkh@time.cdrom.com>
Sender: cvs-user-owner@freebsd.org
Precedence: bulk

> 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