Commit 4d629163 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

[ngrams] attempt to fix repo conflicts with `transformWith`

But I'm not sure I know what I'm doing...
parent 56a5dc6c
Pipeline #3230 passed with stage
in 94 minutes and 35 seconds
......@@ -207,8 +207,9 @@ ngramsStatePatchConflictResolution
-> NgramsTerm
-> ConflictResolutionNgramsPatch
ngramsStatePatchConflictResolution _ngramsType _ngramsTerm
= (ours, (const ours, ours), (False, False))
-- = (ours, (const ours, ours), (False, False))
-- (False, False) mean here that Mod has always priority.
= (ours, (const ours, ours), (True, False))
-- (True, False) <- would mean priority to the left (same as ours).
-- undefined {- TODO think this through -}, listTypeConflictResolution)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment