Implement staging of conflict markers during merge operations#21

Merged

roble merged 3 commits into

mainfrom

Jun 12, 2026

Commits on Jun 12, 2026

feat: implement staging of conflict markers in git index during merges
roble
committed
Merge branch 'dev' of https://github.com/saucebase-dev/module-installer into dev
roble
committed
PHP Linting (Pint)

roble
authored and
github-actions[bot]
committed