mirror of
https://github.com/stablyai/orca.git
synced 2026-09-29 08:03:20 +00:00
Conflicts, and how each was resolved: - config/nsis/daemon-host-uninstall.nsh: main deleted it (#17906 consolidated every NSIS hook into config/nsis/orca-installer-hooks.nsh, because electron-builder accepts exactly one `nsis.include`). Took the deletion; the rewritten uninstall macro is ported into the hooks file in the next commit. Doc references repointed at the surviving file. - docs/reference/windows-edr-posture.md: add/add. This branch's base (#17856) squash-landed on main, and #18151 then corrected several process-table claims there. Took main's corrected text and re-applied only this branch's daemon-host edits (the rename removal, T1036.005, the spawn-tree line, the checklist row). - .gitignore, AGENTS.md: kept both sides' added lines.