@adecore/merge 0.17.0-beta.1 → 0.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/README.md +6 -2
- package/package.json +1 -1
package/LICENSE
CHANGED
package/README.md
CHANGED
|
@@ -2,7 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
Pure line diffs, three-way merge blocks and conflict resolution. It uses no filesystem, Git process, editor or browser API.
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
```sh
|
|
6
|
+
bun add @adecore/merge
|
|
7
|
+
```
|
|
8
|
+
|
|
9
|
+
Licensed under FSL-1.1-MIT, see [LICENSE](./LICENSE).
|
|
6
10
|
|
|
7
11
|
```ts
|
|
8
12
|
import { draftOf, joinLines, shapeOf, splitBlocks, splitLines } from '@adecore/merge';
|
|
@@ -22,6 +26,6 @@ const text = joinLines(draftOf(blocks, answers).lines, shapeOf(ours));
|
|
|
22
26
|
|
|
23
27
|
The fixed answer above represents a caller's completed decision. Unanswered draft conflicts use ours without markers; saving requires a separate unresolved check. Preserve text shape and verify input versions before writing. The host owns authorization, file access and stale-answer rejection.
|
|
24
28
|
|
|
25
|
-
Read the [overview](https://adecore.dev/merge/), [
|
|
29
|
+
Read the [overview](https://adecore.dev/merge/), [lines and diffs](https://adecore.dev/merge/lines) and [three-way merge](https://adecore.dev/merge/three-way).
|
|
26
30
|
|
|
27
31
|
From the repository root, run `bun run --cwd packages/merge test`, `typecheck` or `build`. The isolated `test:memory` command checks bounded diff memory workloads. A source-relative example is in [examples/resolve-conflict.ts](./examples/resolve-conflict.ts).
|