docs: add interactive merge conflict resolution UI documentation for inkeep pull

[inkeep]

Summary

This PR documents the new interactive merge conflict resolution UI feature added to the inkeep pull CLI command in v0.61.0.

Changes

agents-docs/content/guides/cli/pull-from-remote.mdx

• Added new "Resolving merge conflicts" section explaining when conflicts occur and how the interactive UI helps users resolve them
• Includes tip about using --introspect flag to skip conflict resolution

agents-docs/content/typescript-sdk/cli-reference.mdx

• Added "Merge Conflict Resolution" subsection under the inkeep pull command documentation
• Documents the three resolution options: keep local, accept remote, or manually merge

Related

Documents the feature added in PR #2844 (Version Packages):

Add interactive merge conflict resolution UI for inkeep pull command

cc @miles-kt-inkeep

[changeset-bot]

⚠️ No Changeset found

Latest commit: 2eb95c5

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)
agents-api	Ready	Preview, Comment	Mar 27, 2026 4:32pm
agents-docs	Ready	Preview, Comment	Mar 27, 2026 4:32pm
agents-manage-ui	Ready	Preview, Comment	Mar 27, 2026 4:32pm