chore: Add instructions for handling merge conflicts

[teeohhem]

Should help agents be a bit more careful with merge conflict resolution.

[changeset-bot]

⚠️ No Changeset found

Latest commit: fd6bf40

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
hyperdx-oss	Ready	Preview, Comment	Mar 18, 2026 9:33pm

[github-actions]

PR Review

✅ No critical issues found.

This is a documentation-only change adding merge conflict resolution guidelines to AGENTS.md. The content is clear, actionable, and addresses a real operational concern (agents silently dropping changes during conflict resolution). No code changes to review.

[github-actions]

E2E Test Results

✅ All tests passed • 92 passed • 3 skipped • 924s

Status	Count
✅ Passed	92
❌ Failed	0
⚠️ Flaky	1
⏭️ Skipped	3

Tests ran across 4 shards in parallel.

View full report →