Bookmarks

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.