Fixing Conflicts

• Whenever an update produces conflicts, the original source file will be marked up as follows:

[[ krb5_magic magic;

krb5_data realm;
<<<<<<< func.h

                char *pname; /*Single string containing name.*/

krb5_int32 type;

    krb5_data FAR *data;                /* An array of strings */

krb5_int32 length;
>>>>>>> 1.2
} krb5_principal_data;]]

• The text between the line of less thans and the line of equal signs

  is 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 the

  desired code.