Version control, collaborative editing and undo – conflict resolution mechanisms | Hacker News Reader