Path: utzoo!attcan!uunet!lll-winken!lll-tis!ames!ai.etl.army.mil!hoey
From: hoey@ai.etl.army.mil (Dan Hoey)
Newsgroups: comp.software-eng
Subject: Re: Looking for a program to merge two files interactively
Message-ID: <166@ai.etl.army.mil>
Date: 5 Aug 88 22:04:28 GMT
References: <Jul.22.07.54.48.1988.21328@paul.rutgers.edu>
Reply-To: hoey@ai.etl.army.mil (Dan Hoey)
Distribution: na
Organization: Naval Research Lab, Washington, DC
Lines: 13

In article <...21328...> pratt@paul.rutgers.edu (Lorien Y. Pratt) writes:
>I have a program which consists of about 100 different files.  A couple of
>months ago, I began two sets of modifications to this program, each of which
>was kept in a different directory.  I now would like to merge these
>modifications into a single program.

You haven't mentioned whether you kept around a crucial piece of information:
the common ancestor from which both versions were derived.  There are several
programs such as RCS's "merge" (based on Unix's "diff3") that can be used to
merge the versions semi-automatically.  Where the modifications overlap, both
pieces are included in the output, and you get to merge them automatically with
your favorite editor.

Dan