OXYGENHUB

Changes up to # 9e5ef6c23006 touching crates/hub/tests/edits.rs · 5

See as swimlanes (independent work side by side)

Resolve a binary file's conflicting versions by keeping one head
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
Web edits and browser conflict resolution; landing under a policy
Andy McCall ·
✔ 145306044896