KICAD_DIFF::KICAD_MERGE_ENGINE::OPTIONS Struct Reference

#include <kicad_merge_engine.h>

Public Attributes
bool	preferAutoMerge = true
	When true, property-orthogonal edits auto-merge silently.
bool	autoResolveEqualValues = true
	When true and a property edit conflicts but the side values are equal, the resolution is automatically OURS (the equal value).

Detailed Description

Definition at line 151 of file kicad_merge_engine.h.

Member Data Documentation

autoResolveEqualValues

bool KICAD_DIFF::KICAD_MERGE_ENGINE::OPTIONS::autoResolveEqualValues = true

When true and a property edit conflicts but the side values are equal, the resolution is automatically OURS (the equal value).

Definition at line 159 of file kicad_merge_engine.h.

Referenced by KICAD_DIFF::ResolvePropertyConflict().

preferAutoMerge

bool KICAD_DIFF::KICAD_MERGE_ENGINE::OPTIONS::preferAutoMerge = true

When true, property-orthogonal edits auto-merge silently.

When false, every touched-on-both-sides item becomes a conflict.

Definition at line 155 of file kicad_merge_engine.h.

Referenced by BOOST_AUTO_TEST_CASE(), and KICAD_DIFF::ResolvePropertyConflict().

---

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

• kicad_merge_engine.h