Closed josephmyers closed 1 year ago
My understanding of how Chorus works is that it should apply a "you win" policy whenever a merge conflict arises. So the fact that the merge conflict cannot be resolved by Chorus (or so it seems) is a bug to me.
Is this solved by #297?
It is, thanks
log.txt
Above is the log output from LfMerge. It's referencing SIL.ChorusPlugin.LfMergeBridge v3.8.0-beta*. It also references SIL.Chorus.ChorusMerge v5.0.0-beta0030, but I'm not exactly sure how that reference is being used. Here's the exception captured from Chorus:
My test case is as follows: