resolveConflict() api

[samuelstroschein]

Context

This PR introduces the possibility for apps to resolve conflicts. Closes opral/lix-sdk#49

A conflict is resolved by providing a change, which does not necessarily create a new change. If the change does not exist in the database (a resolution via merging two changes that result in a new change, for example), the function inserts the change.

await resolveConflict({
  lix, 
  conflict: conflict,
  resolveWithChange: changes[0],
});

[changeset-bot]

⚠️ No Changeset found

Latest commit: e91493d

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

[samuelstroschein]

Used as marker if a conflict has been resolved.

[samuelstroschein]

@janfjohannes if you approve the PR, merge it to unblock @NiklasBuchfink and @NilsJacobsen while I am asleep

[janfjohannes]

@samuelstroschein approved so you can proceed as you want, but i have a few comments that would probably be better improved if there is time...