dave 4ed1fb5110 huskies: merge 854

2026-04-29 09:29:32 +00:00

..

squash

huskies: merge 854

2026-04-29 09:29:32 +00:00

conflicts.rs

refactor: split agents/merge.rs into mod.rs + squash.rs + conflicts.rs

2026-04-26 21:15:06 +00:00

mod.rs

fix(merge): use server-start-time, not pid, for stale-merge detection

2026-04-28 20:41:32 +00:00