Skip to content
OXYGEN
HUB
◐
SIGN IN
REGISTER
Repositories
Explore
Help
v0.9.24
andymccall
/
oxygenhub
◯
public
Code
Changes
Proposals
Issues
28
Flow
Releases
Artifacts
Releases
Build artifacts
Images
Terraform state
Reports
More
Insights
Bookmarks
Tags
Diffusion
Trust
Pushes
Conflicts
Changes
up to # 71e65fcf95ab touching templates/conflicts.html · 5
See as swimlanes
(independent work side by side)
Resolve a binary file's conflicting versions by keeping one
Andy McCall
·
1 month ago
✔
9e5ef6c23006
Resolve name conflicts by keeping a candidate
Andy McCall
·
1 month ago
✔
fd958fbc06fb
Resolve conflicts region by region
Andy McCall
·
1 month ago
✔
c5f3bde466d1
Web edits and browser conflict resolution; landing under a policy
Andy McCall
·
1 month ago
✔
145306044896
Milestone 0.1: browse
Andy McCall
·
1 month ago
✔
d23464c0ac60
Keyboard
/
Search
g
c
Code
g
h
History
g
b
Bookmarks
g
t
Trust
y
Permalink to this state (files and trees)
?
This sheet
All keys
·
Help