colineonset

Public

Onset: version control where nobody waits and nothing gets lost. The on command, its core and onset-server.

CodeIssuesChange requestsActionsDiscussionsCommitsBranchesReleasesSearchContributorsCompare

Code Issues Change requests Actions Discussions Commits Branches Releases Search Contributors Compare

Upstream

Docs Pricing Support Changelog

coline/onset

colineonset

Public

Onset: version control where nobody waits and nothing gets lost. The on command, its core and onset-server.

CodeIssuesChange requestsActionsDiscussionsCommitsBranchesReleasesSearchContributorsCompare

Code Issues Change requests Actions Discussions Commits Branches Releases Search Contributors Compare

feat(vcs): smart merges for code: both-added spots, import blocks, TOML by key

Radin committed …

Author: Radin · radin@coline.appOct 28, 2026 at 17:50
Committer: Radin · radin@coline.appOct 28, 2026 at 18:57
Parents: b3533792eea5

feat(vcs): smart merges for code: both-added spots, import blocks, TOML by key

Where a line-by-line merge sees a conflict but there's one clear answer:
- both sides added lines at the same place, none in common (two new
  functions, tests or changelog entries): both go in, main's first;
- import blocks in JS/TS, Python, Rust, Go, Java/Kotlin, C/C++, Swift and
  C#: each side's added imports go in and removed ones go, kept sorted when
  they were;
- TOML merges by table and key, as JSON does, keeping layout and comments.
Two new files at one path stay a conflict, as in git. Lands on the host and
syncs on this machine both use them.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

4 files changed+349−4

← Back to history