GeoVerse

Appearance

Documentation / @geoverse/editor-core / ThreeWayMergeResult

Interface: ThreeWayMergeResult ​

Defined in: packages/editor-core/src/sync/merge.ts:80

Properties ​

diverged ​

ts
diverged: MergeEntry[];

Defined in: packages/editor-core/src/sync/merge.ts:87

几何 diverged===true 的条目（resolver 实际被征询的真冲突）。

entries ​

ts
entries: MergeEntry[];

Defined in: packages/editor-core/src/sync/merge.ts:81

localWins ​

ts
localWins: MergeEntry[];

Defined in: packages/editor-core/src/sync/merge.ts:83

几何 outcome==='local' 的条目（需 rebase 后重提交）。

propertyDiverged ​

ts
propertyDiverged: MergeEntry[];

Defined in: packages/editor-core/src/sync/merge.ts:91

属性维度存在真分歧字段的条目（divergedFields 非空）。

propertyMerges ​

ts
propertyMerges: MergeEntry[];

Defined in: packages/editor-core/src/sync/merge.ts:89

含属性维度合并的条目（property 非空）。

remoteWins ​

ts
remoteWins: MergeEntry[];

Defined in: packages/editor-core/src/sync/merge.ts:85

几何 outcome==='remote' 的条目（采纳服务端）。