OXYGENHUB

History of mergeBookmark 2 changes

In src/extension.ts, lines 1654–1688 on v0.18.0. 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 1654,1688:src/extension.ts.

Withdraw tags, verify the transparency log, shallow clones, keep a side or both sides of a conflict, commit and amend by paths, merge remote bookmarks (closes #11) mainv0.18.0 head
Andy McCall via agent:claude@andymccall agent ·
◈ dac6876e4d08
Milestone 0.3: bookmark picker (switch, create, merge, delete), fetch, pull, push and push bookmark with results, sync counter and Sync, push confirmation
Andy McCall ·
✔ c8f955891224