codemerge_check
Checks a merge session for overlapping file claims with other sessions, returns conflicts and confirms safe to proceed. Records current HEAD for CAS comparison at merge time.
Instructions
Check for overlapping file claims with other sessions.
Returns whether the session is clean to proceed, lists any conflicts, and records the current main HEAD for CAS comparison at merge time.
Args:
session_id: The merge session ID
main_changed_files: Files changed on main since base (optional, for overlap check)
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| session_id | Yes | ||
| main_changed_files | No |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
No arguments | |||