OXYGENHUB

Changes up to # b1860d6090ec touching templates/conflicts.html · 6

See as swimlanes (independent work side by side)

UI polish: keys, backups, wiki, editor, bookmarks, summaries, backdrops v0.5.0
Andy McCall ·
✔ ffb67a81188c
Resolve a binary file's conflicting versions by keeping one
Andy McCall ·
✔ 9e5ef6c23006
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
Milestone 0.1: browse
Andy McCall ·
✔ d23464c0ac60