As you review the WIP File, you notice various lines are annotated on the left side--in the first eight columns of the file. These annotations indicate the changes made to the Root program by each Derivation.
Indicates that a change has occurred between the Root and one of the Derivations.
Indicates that a conflict exists at this point; this means that both Derivations made different changes to this line of the Root file.
Indicates that a line was added (inserted) by one of the Derivation files.
Indicates that a line was deleted by one of the Derivation files.
Indicates which Derivation the change came from, either 1 or 2. If the change came from both derivation files, the annotation would be 1,2.
Indicates a comment line. One or more asterisks may appear at the beginning of the line, but an asterisk in the first position of the line signifies that it is a comment line. PDM merge processing ignores comment lines.
Examples
A line has been inserted by Derivation 1.
A line has been deleted by Derivation 2.
There has been a common deletion; both Derivation files deleted the same line.
A potential conflict exists at this point in the original program. Both versions inserted different lines at the same place in the original program.
Note: See Editing the WIP File for instructions on editing a WIP file.
|
Copyright © 2014 CA Technologies.
All rights reserved.
|
|