Artifact 42df37cabd38d36af29e4c86be1c96f794988e6cf31a86bb976bbed02face5ee:
- File
internal/merge/doc.go
— part of check-in
[f5744359d3]
at
2026-04-19 16:30:54
on branch trunk
— Initial open source release
libfossil is a pure-Go implementation of the Fossil SCM, reading and writing the same .fossil SQLite repository format as upstream Fossil.
This is the first public release of code that previously lived in a private repository. The module path is github.com/danmestas/libfossil and the binary is named libfossil to avoid $PATH collisions with upstream fossil.
Included: - Repo lifecycle (create, clone), checkout/checkin, timeline, merge, diff, annotate, shun, tag, branch, bisect, stash, undo/redo - Sync-over-HTTP protocol (client and handler) - Two SQLite drivers: modernc (pure Go, default) and ncruces (wasm-capable) - Observer interfaces (SyncObserver, CheckoutObserver) with an optional OpenTelemetry implementation in observer/otel (separate submodule) - Deterministic simulation testing harness with BUGGIFY fault injection - Kong-based embeddable CLI under cli/ and a standalone binary under cmd/libfossil/ (user: [email protected], size: 609) [annotate] [blame] [check-ins using]
// Package merge provides three-way merge with pluggable strategies. // // Register strategies at init time via [Register], then look them up by // name with [StrategyByName]. The built-in strategies are: // // - ThreeWayText: line-level LCS-based merge with conflict markers // - Binary: treats any difference as a conflict // - LastWriterWins: always picks the remote side // - ConflictFork: creates a fork instead of merging // // [FindCommonAncestor] walks the plink DAG to locate the merge base // for two divergent checkins. [DetectForks] identifies open forks in // a repository. package merge