fromGitMarkers
Function: fromGitMarkers()
fromGitMarkers<
T>(edited,result):MergeResult<T>
Defined in: packages/versioning/src/conflicts/markers.ts:88
Scan a user-edited annotated object and determine which conflicts have been resolved (markers/sentinels replaced with concrete values) vs. which remain.
Type Parameters
T
T
Parameters
edited
T
the annotated object after user editing (output of toGitMarkers, possibly modified)
result
MergeResult<T>
the original merge result whose conflict list is consulted
Returns
MergeResult<T>
a new MergeResult with only the still-unresolved conflicts