unbundle resolveConflict into resolveConflictBySelecting and resolveConflictWithNewChange

[samuelstroschein]

Context

Resolve conflict does two jobs at once which leads to confusion and a bloated implementation. See opral/monorepo#3073 (comment)

Proposal

Unbundle the two different purposes into dedicated functions.

await resolveConflictBySelecting({ lix, conflict, select: change.id })
await resolveConflictWithNewChange({ lix, conflict, change: newChange })

The function names can be improved later. If we figure out that selecting fulfills the majority of use cases, we can alias resolveConflictBySelecting with resolveConflict