details

Check for conflicts between your work and the team's:

Run git diff --name-only HEAD to get the list of files you've changed
Use codepilot_check_conflicts MCP tool with those file paths
For any conflicts found, clearly show:
- Which file has a conflict
- Who else changed it and when
- What they changed (summary)
- Whether it's a hard conflict (they're actively editing) or soft (recently changed)
- Recommended action (wait, coordinate, or safe to proceed)
If no conflicts, confirm all clear
If there are conflicts, offer to message the teammate via codepilot_send_message

technical