OXYGENHUB

Changes up to # d3e75fb41e61 touching templates/resolve_name.html · 4

See as swimlanes (independent work side by side)

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