Martín Lucas Golini 66d22ea5bb Add integrated Git conflict resolution workflow ...

Introduce a three-pane UIMergeView with an editable shared result
document, conflict navigation and acceptance actions, live diff
highlighting, synchronized scrolling, and contextual pane labels.

Read conflict stages directly from Git's index, detect paused merge
operations, restore conflict sessions, and support resolving, staging,
recreating, continuing, committing, and aborting operations.

Add repository-aware conflict state handling, safe asynchronous
lifetimes, merge operation UI, configurable key modifiers, i18n
strings, and focused merge-view and Git conflict tests.

2026-08-27 22:18:58 -03:00

..

plans

graphics: improve native system font fallback

2026-08-23 16:59:23 -03:00

rules

Add integrated Git conflict resolution workflow

2026-08-27 22:18:58 -03:00

SOUL.md

ecode: add customizable debugger panel layouts

2026-08-14 00:17:29 -03:00