Turn reviewer decisions into ops. ours keeps the target state (no op), theirs adopts the candidate value, edited takes the supplied replacement component value (component-scoped conflicts only).
ours
theirs
edited
Turn reviewer decisions into ops.
ourskeeps the target state (no op),theirsadopts the candidate value,editedtakes the supplied replacement component value (component-scoped conflicts only).