Implement a lix.resolveConflict({ conflict, pick: ""}) API.
Potential logic
A user expresses that `` is the chosen winner of a conflict.
The lix app calls lix.resolveConflict
If the picked change is not in the sequence but the loser is, swap both changes (put the picked change in the sequence, the loser out of the sequence).
Mark the conflict as resolved by setting conflict.picked_change_id
Context
Apps (users) need a way to resolve conflicts by expressing a "take this change and not this one".
https://github.com/opral/monorepo/pull/3067 did introduce the possibility of merging and the concept of conflicts but no way to resolve conflicts.
Proposal
Implement a
lix.resolveConflict({ conflict, pick: ""})
API.Potential logic
lix.resolveConflict
conflict.picked_change_id
Workaround for Fink2 that avoids MESDK-175
Below is pseudocode that should work to simulate a sequence of