search

opral / lix-sdk

1 stars 0 forks source link

`mergePreview()`/change proposals #48

Open samuelstroschein opened 2 months ago

samuelstroschein commented 2 months ago

Context

Apps want to display preview the outcome of a possible merge and have a flow for marking changes as "reviewed".

samuelstroschein commented 1 month ago

Do we want/need persistency of "merge previews" (now)?

If yes, the result might be that "merging another file" is creating a change proposal. A change proposal is a branch that should be merged into another branch.

@nils.jacobsen @niklas.buchfink (fink prototype) @jannes.blobel @jan.johannes (csv prototype) @martin.lysk1 (because lix)

https://app.excalidraw.com/s/1RmnkzJA3Ph/9tG6ZZzPPZQ

Understanding Merge Previews and Change Proposals