OXYGENHUB

History of resolve 5 changes

In src/cli/workspace.rs, lines 1477–1549 on 642da2636de23fd2aee00ace74e1ec4abace8241fb73d3f30519be0fdc1d4c8c. Every change that wrote or deleted one of these lines, or deleted a line from between them. Exact, because each line keeps its identity across edits; edits elsewhere in the file are not here. Also: oxy log -L 1477,1549:src/cli/workspace.rs.

oxy resolve --both keeps both sides of an adjacent insertion (closes #121)
Andy McCall via agent:claude@andymccall agent ·
◈ 9bd98cfb4f7e
oxy resolve PATH settles a replace conflict with the working copy's content (closes #140)
Andy McCall via agent:claude@andymccall agent ·
◈ 157d02e95586
Unbound hosted repositories adopt the first pusher's id
Andy McCall ·
✔ 75167672ebcd
Machine interface for editors (spec 0.8b): oxy root, cat, version, hunks, discard by path or hunk; --json on log (with --path), show, diff, resolve, op log, bookmark list, remote list, fetch, pull, push, submodule status, bisect status, verify, policy show; commit --hunks; integration test over every JSON command
Andy McCall ·
✔ c6aa5bd9d1c8
User config file layered under repo config, user-scoped identities; split the CLI into modules; fix clone remote persistence
Andy McCall ·
✔ fce44ae9ad29