Skip to content

v0.12.1

Choose a tag to compare

@hueyexe hueyexe released this 15 Apr 06:49
· 71 commits to main since this release

Merge Overlap Detection

team_merge now detects when you have local changes to files that the agent also modified, and blocks the merge to prevent silent overwrites.

  • Overlap detection covers unstaged, staged, and untracked files
  • Blocked merges list the conflicting files and preserve the branch for retry
  • team_cleanup safety-net warns (non-blocking) when overlap is detected
  • Stash-pop warnings are now surfaced in merge output (previously swallowed)
  • Graceful fallback if the overlap check itself fails

Full Changelog: v0.12.0...v0.12.1