|Prev||Software Development Tools in Unix||Next|
Whenever an update produces conflicts, the original source file will be marked up as follows:
[[ krb5_magic magic;
char *pname; /*Single string containing name.*/
krb5_data FAR *data; /* An array of strings */
The text between the line of less thans and the line of equal signsis the text from the modified local file.
The text below the line of equals signs is from the repository.
Resolve the conflict by combining these two sections to produce thedesired code.
|Prev||Copyright © 2004 SIPB|