Lukas May cc181ee6ba fix: Parse merge-tree output from stdout instead of catch block ...

simple-git's .raw() resolves successfully even on exit code 1,
returning stdout content. git merge-tree --write-tree outputs
CONFLICT markers to stdout (not stderr), so the catch block
never fired and conflicts were reported as clean merges.

2026-03-06 11:27:32 +01:00

..

server

fix: Parse merge-tree output from stdout instead of catch block

2026-03-06 11:27:32 +01:00

web

fix: Restore sticky header and sidebar by simplifying layout

2026-03-06 11:26:43 +01:00