resolve
Function: resolve()
resolve<
T>(result,resolutions):MergeResult<T>
Defined in: packages/versioning/src/conflicts/resolve.ts:48
Apply a map of resolutions to a merge result, writing resolved values back into the merged object and returning any still-unresolved conflicts.
Type Parameters
T
T
Parameters
result
MergeResult<T>
the merge result containing conflicts and the current merged value
resolutions
Map<string, Resolution>
a map from conflict path to resolution instruction
Returns
MergeResult<T>
a new MergeResult with resolved conflicts applied and remaining conflicts listed