Artifact [c9c1e433b4]

Artifact c9c1e433b40e7c8afd86292c9afd21513c19dd1abb757f4d84e1d08b98d9e7ac:

• File internal/merge/lastwriter.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: 424) [annotate] [blame] [check-ins using]

package merge

func init() { Register(&LastWriterWins{}) }

// LastWriterWins picks the newer version. The caller passes the newer
// content as remote. Always clean — no conflicts possible.
type LastWriterWins struct{}

func (l *LastWriterWins) Name() string { return "last-writer-wins" }

func (l *LastWriterWins) Merge(base, local, remote []byte) (*Result, error) {
	return &Result{Content: remote, Clean: true}, nil
}