No such method `conflictingSteps` on Merge
applyAll is referring to nonexistent method conflictingSteps
applyAll(user) {
let steps = this.conflictingSteps.map(([index, step]) => step),
tr = new Transform(this.doc), changes = this.changes
while(steps.length) {
let mapped = steps.pop().map(tr.mapping)
if (mapped && !tr.maybeStep(mapped).failed) {
changes = this.changes.addSteps(tr.doc, [tr.mapping.maps[tr.mapping.maps.length-1]], {user})
}
}
return {tr, merge: new Merge(tr.doc, changes)}
}
Edited by Matias Piipari