David,
Here is the best solution you'll get :) You need to download a program
called Beyond Compare. Then, create 2 empty text files on your desktop.
Copy/Paste the code from 1 source member into 1 of the text files, do the
same with the second. Then open up Beyond Compare and do a compare on
those two files. There is merging capability in Beyond Compare, I haven't
used it, so I'm not sure if it is available in the trial. Great program
for comparing source. It blows the RDP compare out of the water.


Thanks
Bryce Martin
Programmer/Analyst I
570-546-4777



David FOXWELL <David.FOXWELL@xxxxxxxxx>
Sent by: wdsci-l-bounces@xxxxxxxxxxxx
12/07/2010 04:41 AM
Please respond to
Rational Developer for IBM i / Websphere Development Studio Client for
System i & iSeries <wdsci-l@xxxxxxxxxxxx>


To
Rational Developer for IBM i / Websphere Development Studio Client for
System i & iSeries <wdsci-l@xxxxxxxxxxxx>
cc

Subject
[WDSCI-L] Trouble merging my changes






Hi,

I have an RPGLE member that I have changed while another developper was
also changing it in another library. Now I have to insert my changes in
the production version of the member. I cannot use the compare feature as
the source is too large and too many changes have been made since I copied
the production version into my development library. So, I filter all my
changes by date. Now I know what to insert, but how do I find out where to
insert it? I can press ctrl w to see the line immediately above the
change, find that line in the target source and copy. Now to find the next
change I need to filter my changes again.

What am I doing wrong?

As an Amazon Associate we earn from qualifying purchases.

This thread ...

Replies:

Follow On AppleNews
Return to Archive home page | Return to MIDRANGE.COM home page

This mailing list archive is Copyright 1997-2022 by midrange.com and David Gibbs as a compilation work. Use of the archive is restricted to research of a business or technical nature. Any other uses are prohibited. Full details are available on our policy page. If you have questions about this, please contact [javascript protected email address].

Operating expenses for this site are earned using the Amazon Associate program and Google Adsense.