Procedure to resolve conflict to ours or theirs based on dolt_conflict_id

[YourRightWebsite]

Right now there is a procedure called DOLT_CONFLICTS_RESOLVE() that can resolve all conflicts within a table using ours or theirs, however it would be helpful to have a similar procedure that could resolve a conflict to ours or theirs using the unique ID for a given conflict.

[fulghum]

Thanks for the great feature request! 🙏 It seems like we could support an optional fourth parameter to DOLT_CONFLICTS_RESOLVE() that would let you pass in the conflict hash so you could scope down the resolution to a single conflict.

Implementation-wise... this is a little more involved than the current implementation, since at a table granularity, it's very easy to swap a whole table between roots, but working on an individual row granularity should still be pretty straightforward.