OXYGENHUB

Changes up to # 129c23effb73 touching crates/hub/src/web/resolve.rs · 7

See as swimlanes (independent work side by side)

VS Code links name oxygenhub.oxygen v0.1.0 head
Andy McCall ·
✔ 129c23effb73
VS Code links name oxygenhub.oxygen-vscode
Andy McCall ·
✔ d3e75fb41e61
Resolve conflicts together, live
Andy McCall ·
✔ 5e6d6484c28e
Resolve a binary file's conflicting versions by keeping one
Andy McCall ·
✔ 9e5ef6c23006
Resolve in VS Code; the name conflict test picks its candidate reliably
Andy McCall ·
✔ 16cb2b3aa947
Resolve name conflicts by keeping a candidate
Andy McCall ·
✔ fd958fbc06fb
Resolve conflicts region by region
Andy McCall ·
✔ c5f3bde466d1