| 212 | /// and tracked here for reporting. |
| 213 | #[derive(Debug, Clone, PartialEq, Eq)] |
| 214 | pub struct Conflict { |
| 215 | /// The type of conflict. |
| 216 | pub conflict_type: ConflictType, |
| 217 | /// Path to the file containing the conflict. |
| 218 | pub path: String, |
| 219 | /// Position in the graph where the conflict occurs. |
| 220 | pub inode_vertex: Position<NodeId>, |
| 221 | /// Line number in the output file (1-based). |
| 222 | pub line: usize, |
| 223 | /// Changes involved in this conflict. |
| 224 | pub changes: Vec<Hash>, |
| 225 | /// Unique ID for matching begin/end markers. |
| 226 | pub id: usize, |
| 227 | } |
| 228 | |
| 229 | impl Conflict { |
| 230 | /// Create a new order conflict. |