[Search for users]
[Overall Top Noters]
[List of all Conferences]
[Download this site]
| Title: | USG buildhelp questions/answers |
|
| Moderator: | SMURF::FILTER |
|
| Created: | Mon Apr 26 1993 |
| Last Modified: | Mon Jan 20 1997 |
| Last Successful Update: | Fri Jun 06 1997 |
| Number of topics: | 2763 |
| Total number of notes: | 5802 |
2341.0. "looks like a merge tool problem..." by AOSG::FILTER (Automatic Posting Software - mail to flume::puck) Wed Jun 12 1996 20:08
Date Of Receipt: 12-JUN-1996 18:33:37.29
From: WASTED::stuarth "Stuart Hollander OSG"
To: odehelp@DEC:.zko.wasted
CC: stuarth@DEC:.zko.wasted
Subj: looks like a merge tool problem...
odehelp,
Here is a merge tool problem I ran into.
I have been able to do the correct merge without
the 'merge' command. Still, if there is someone who
maintains these tools and is interested in this here it is:
Reference the files: ~stuarth/public/kern_aio.c*
If you try to merge
% merge kern_aio.c kern_aio.c.hw6 kern_aio.c.mp2
it should merge the changes from hw6--->mp2 into kern_aio.c.
Only two lines changed between hw6 and mp2 but many changes
are attempted when the merge command is used.
Stuart
| T.R | Title | User | Personal
Name | Date | Lines
|
|---|