Resolve conflicts region by region (P1a) issue #30 closed: completed andymccall opened this 1 month ago · 0 comments

Andy's list, item 1: conflict resolution on OxygenHub. A resolver page for a conflicted state:

• Per conflict region: pick a side, several sides or none, or edit freely.
• Commit the result as a resolution change through the web-edit path.
• A shareable link to each conflict.

First part (P1a): text conflicts. Tree conflicts and the VS Code hand-off follow (P1c); live collaboration is P1b.