KICAD_DIFF::PROPERTY_RESOLUTION_OUTCOME Struct Reference

Per-property merge decision result. More...

#include <kicad_merge_engine.h>

Public Attributes
PROP_RES	kind = PROP_RES::OURS
bool	isUnresolved = false

Detailed Description

Per-property merge decision result.

kind is the picked side (OURS or THEIRS — CUSTOM is never produced by the auto-resolver). isUnresolved is true when the engine couldn't safely auto-resolve; downstream code records the parent item's id in MERGE_PLAN::unresolved so the user sees a real conflict count.

Definition at line 190 of file kicad_merge_engine.h.

Member Data Documentation

isUnresolved

bool KICAD_DIFF::PROPERTY_RESOLUTION_OUTCOME::isUnresolved = false

Definition at line 193 of file kicad_merge_engine.h.

Referenced by KICAD_DIFF::ResolvePropertyConflict().

kind

PROP_RES KICAD_DIFF::PROPERTY_RESOLUTION_OUTCOME::kind = PROP_RES::OURS

Definition at line 192 of file kicad_merge_engine.h.

Referenced by KICAD_DIFF::ResolvePropertyConflict().

---

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

• kicad_merge_engine.h