OXYGENHUB
◆ v0.18.0 oxygen-vscode / walkthrough / bookmarks.md
216 B · Markdown · last changed Oxygen colours, a Get started walkthrough, Create Identity (0.14.0) 1 month ago renderedsource blame history raw
013fefef Andy McCall ↶ 1
# Bookmarks
2
3
Bookmarks are Oxygen's branches. Because changes commute, merging two bookmarks is the union of their changes: no merge change, and a real conflict is recorded where it is, to resolve whenever you like.