conflict annotation tag

1 minute readReference

Synopsis

For jobs found to be in conflict, this element provides information about the conflict, such as the particular file that triggered the conflict, and the job which modified the file.

Attributes

file

For file conflicts, the specific file that triggered the conflict.

key

For key and value conflicts, the registry key involved in the conflict.

rerunby

The id of the rerun job created to replace this job.

type

Type of the conflict, one of:

  • file: the conflict was over a file or directory.

  • key: the conflict was over a registry key (Windows only).

  • value: the conflict was over a registry value (Windows only).

  • cascade: the conflict was a fallout from a conflict in an earlier job, or was over other non-filesystem versioned data.

value

For value conflicts, the registry value that triggered the conflict.

writejob

For non-cascade conflicts, the id of the writer job that this job should have waited for before running.

Contents

None.