Conflict Struct Reference

Description of a single conflict between modifications. More...

#include <conflict.h>

Data Fields
char *	description
	Human-readable description (malloc'd, owned by ConflictSet)
ExtensionID	ext_id_a
	Extension owning modification A.
ExtensionID	ext_id_b
	Extension owning modification B.
uint32_t	mod_index_a
	Index of first conflicting modification.
uint32_t	mod_index_b
	Index of second conflicting modification.
bool	resolved
	Whether this conflict was resolved.
ConflictType	type
	What kind of conflict.

Detailed Description

Description of a single conflict between modifications.

Definition at line 62 of file conflict.h.

Field Documentation

description

char* Conflict::description

Human-readable description (malloc'd, owned by ConflictSet)

Definition at line 71 of file conflict.h.

ext_id_a

ExtensionID Conflict::ext_id_a

Extension owning modification A.

Definition at line 68 of file conflict.h.

ext_id_b

ExtensionID Conflict::ext_id_b

Extension owning modification B.

Definition at line 69 of file conflict.h.

mod_index_a

uint32_t Conflict::mod_index_a

Index of first conflicting modification.

Definition at line 65 of file conflict.h.

mod_index_b

uint32_t Conflict::mod_index_b

Index of second conflicting modification.

Definition at line 66 of file conflict.h.

resolved

bool Conflict::resolved

Whether this conflict was resolved.

Definition at line 73 of file conflict.h.

type

ConflictType Conflict::type

What kind of conflict.

Definition at line 63 of file conflict.h.

---

The documentation for this struct was generated from the following file:

• include/conflict.h