Function resolveConflict

resolveConflict<T extends JsonValue>(
    input: MatchConflictErrorInput & MergeStatesBaseInput<T> & {
        arrays?: undefined;
        autoMerge?: undefined;
        derived?: undefined;
        groups?: undefined;
        includeReport?: undefined;
        rules?: undefined;
    },
): ResolveConflictResult<T>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Type Parameters
- T extends JsonValue
Parameters
- input: MatchConflictErrorInput & MergeStatesBaseInput<T> & {
      arrays?: undefined;
      autoMerge?: undefined;
      derived?: undefined;
      groups?: undefined;
      includeReport?: undefined;
      rules?: undefined;
  }
Returns ResolveConflictResult<T>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:34
resolveConflict<T extends JsonValue>(
    input: MatchConflictErrorInput & MergeStatesBaseInput<T> & {
        arrays?: undefined;
        autoMerge?: undefined;
        derived?: undefined;
        groups?: readonly PathGroup[];
        includeReport?: true;
        rules?: undefined;
    } & { groups: readonly PathGroup[]; includeReport: true },
): ResolveConflictGroupedReportedResult<T>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Type Parameters
- T extends JsonValue
Parameters
- input: MatchConflictErrorInput & MergeStatesBaseInput<T> & {
      arrays?: undefined;
      autoMerge?: undefined;
      derived?: undefined;
      groups?: readonly PathGroup[];
      includeReport?: true;
      rules?: undefined;
  } & { groups: readonly PathGroup[]; includeReport: true }
Returns ResolveConflictGroupedReportedResult<T>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:37
resolveConflict<T extends JsonValue>(
    input: MatchConflictErrorInput & MergeStatesBaseInput<T> & {
        arrays?: undefined;
        autoMerge?: undefined;
        derived?: undefined;
        groups?: readonly PathGroup[];
        includeReport?: true;
        rules?: undefined;
    } & { groups: readonly PathGroup[]; includeReport?: undefined },
): ResolveConflictGroupedResult<T>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Type Parameters
- T extends JsonValue
Parameters
- input: MatchConflictErrorInput & MergeStatesBaseInput<T> & {
      arrays?: undefined;
      autoMerge?: undefined;
      derived?: undefined;
      groups?: readonly PathGroup[];
      includeReport?: true;
      rules?: undefined;
  } & { groups: readonly PathGroup[]; includeReport?: undefined }
Returns ResolveConflictGroupedResult<T>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:40
resolveConflict<T extends JsonValue>(
    input: MatchConflictErrorInput & MergeStatesBaseInput<T> & {
        arrays?: undefined;
        autoMerge?: undefined;
        derived?: undefined;
        groups?: readonly PathGroup[];
        includeReport?: true;
        rules?: undefined;
    } & { groups?: undefined; includeReport: true },
): ResolveConflictReportedResult<T>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Type Parameters
- T extends JsonValue
Parameters
- input: MatchConflictErrorInput & MergeStatesBaseInput<T> & {
      arrays?: undefined;
      autoMerge?: undefined;
      derived?: undefined;
      groups?: readonly PathGroup[];
      includeReport?: true;
      rules?: undefined;
  } & { groups?: undefined; includeReport: true }
Returns ResolveConflictReportedResult<T>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:43
resolveConflict<T extends JsonValue>(
input: ResolveConflictInput<T>,
): ResolveRuntimeResult<T>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Type Parameters
- T extends JsonValue
Parameters
- input: ResolveConflictInput<T>
Returns ResolveRuntimeResult<T>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:46
resolveConflict(
    input: MatchConflictErrorInput & NormalizedMergeStatesInput & {
        arrays?: undefined;
        autoMerge?: undefined;
        derived?: undefined;
        groups?: readonly PathGroup[];
        includeReport?: true;
        rules?: undefined;
    } & { groups: readonly PathGroup[]; includeReport: true },
): ResolveConflictGroupedReportedResult<JsonValue>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Parameters
- input: MatchConflictErrorInput & NormalizedMergeStatesInput & {
      arrays?: undefined;
      autoMerge?: undefined;
      derived?: undefined;
      groups?: readonly PathGroup[];
      includeReport?: true;
      rules?: undefined;
  } & { groups: readonly PathGroup[]; includeReport: true }
Returns ResolveConflictGroupedReportedResult<JsonValue>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:49
resolveConflict(
    input: MatchConflictErrorInput & NormalizedMergeStatesInput & {
        arrays?: undefined;
        autoMerge?: undefined;
        derived?: undefined;
        groups?: readonly PathGroup[];
        includeReport?: true;
        rules?: undefined;
    } & { groups: readonly PathGroup[]; includeReport?: undefined },
): ResolveConflictGroupedResult<JsonValue>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Parameters
- input: MatchConflictErrorInput & NormalizedMergeStatesInput & {
      arrays?: undefined;
      autoMerge?: undefined;
      derived?: undefined;
      groups?: readonly PathGroup[];
      includeReport?: true;
      rules?: undefined;
  } & { groups: readonly PathGroup[]; includeReport?: undefined }
Returns ResolveConflictGroupedResult<JsonValue>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:52
resolveConflict(
    input: MatchConflictErrorInput & NormalizedMergeStatesInput & {
        arrays?: undefined;
        autoMerge?: undefined;
        derived?: undefined;
        groups?: readonly PathGroup[];
        includeReport?: true;
        rules?: undefined;
    } & { groups?: undefined; includeReport: true },
): ResolveConflictReportedResult<JsonValue>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Parameters
- input: MatchConflictErrorInput & NormalizedMergeStatesInput & {
      arrays?: undefined;
      autoMerge?: undefined;
      derived?: undefined;
      groups?: readonly PathGroup[];
      includeReport?: true;
      rules?: undefined;
  } & { groups?: undefined; includeReport: true }
Returns ResolveConflictReportedResult<JsonValue>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:55
resolveConflict(
input: MatchConflictErrorInput & NormalizedMergeStatesInput,
): ResolveConflictResult<JsonValue>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Parameters
- input: MatchConflictErrorInput & NormalizedMergeStatesInput
Returns ResolveConflictResult<JsonValue>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:58
resolveConflict(
    input: MatchConflictErrorInput & NormalizedMergeStatesInput & {
        arrays?: undefined;
        autoMerge?: undefined;
        derived?: undefined;
        groups?: readonly PathGroup[];
        includeReport?: true;
        rules?: undefined;
    } & { groups?: undefined; includeReport?: undefined },
): ResolveConflictResult<JsonValue>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Parameters
- input: MatchConflictErrorInput & NormalizedMergeStatesInput & {
      arrays?: undefined;
      autoMerge?: undefined;
      derived?: undefined;
      groups?: readonly PathGroup[];
      includeReport?: true;
      rules?: undefined;
  } & { groups?: undefined; includeReport?: undefined }
Returns ResolveConflictResult<JsonValue>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:61
resolveConflict(
input: NormalizedResolveConflictInput,
): ResolveRuntimeResult<JsonValue>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Parameters
- input: NormalizedResolveConflictInput
Returns ResolveRuntimeResult<JsonValue>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:64
resolveConflict<T extends JsonValue>(
input: MatchConflictErrorInput & AdvancedMergeStatesInput<T>,
): AdvancedResolveConflictResult<T>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Type Parameters
- T extends JsonValue
Parameters
- input: MatchConflictErrorInput & AdvancedMergeStatesInput<T>
Returns AdvancedResolveConflictResult<T>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:67
resolveConflict(
input: MatchConflictErrorInput & NormalizedAdvancedMergeStatesInput,
): AdvancedResolveConflictResult<JsonValue>
Matches a backend error first, then composes the three-way merge only when that error is the configured conflict. The low-level matcher and merge functions remain available for callers that fetch the latest state later.
Parameters
- input: MatchConflictErrorInput & NormalizedAdvancedMergeStatesInput
Returns AdvancedResolveConflictResult<JsonValue>
- Defined in work/conflict-aware-mutation-CAM/conflict-aware-mutation-CAM/src/resolve-conflict.ts:70

Function resolveConflict

Type Parameters

Parameters

Returns ResolveConflictResult<T>

Type Parameters

Parameters

Returns ResolveConflictGroupedReportedResult<T>

Type Parameters

Parameters

Returns ResolveConflictGroupedResult<T>

Type Parameters

Parameters

Returns ResolveConflictReportedResult<T>

Type Parameters

Parameters

Returns ResolveRuntimeResult<T>

Parameters

Returns ResolveConflictGroupedReportedResult<JsonValue>

Parameters

Returns ResolveConflictGroupedResult<JsonValue>

Parameters

Returns ResolveConflictReportedResult<JsonValue>

Parameters

Returns ResolveConflictResult<JsonValue>

Parameters

Returns ResolveConflictResult<JsonValue>

Parameters

Returns ResolveRuntimeResult<JsonValue>

Type Parameters

Parameters

Returns AdvancedResolveConflictResult<T>

Parameters

Returns AdvancedResolveConflictResult<JsonValue>

Settings