Skip to content

fix: resolve leftover conflict markers in MCP docs - #7

Closed
Frankie-Xu wants to merge 1 commit into
mainfrom
cursor/mcp-docs-conflict-markers-bd8a
Closed

Frankie-Xu wants to merge 1 commit into
mainfrom
cursor/mcp-docs-conflict-markers-bd8a

Conversation

@Frankie-Xu

Copy link
Copy Markdown
Owner

Summary

  • Union leftover #146 / #147 conflict markers in docs/en/mcp.md and docs/zh/mcp.md so the published MCP tool table lists both export_jsonld and export_cypher after export_csv.
  • Follow-up sentences now name all four graph exports; the example session includes both new calls.
  • Add tests/docs/test_no_conflict_markers.py so leftover <<<<<<< / ======= / >>>>>>> lines fail CI.

Closes yifanfeng97#148

Out of scope

  • MCP server code
  • README (already lists both tools)
  • MCP write tools or scope parameters

Test plan

  • uv run pytest tests/docs/test_no_conflict_markers.py -q
  • Visual check that neither MCP page still contains conflict markers
Open in Web Open in Cursor 

Co-authored-by: Frankie-Xu <Frankie-Xu@users.noreply.github.com>
@Frankie-Xu

Copy link
Copy Markdown
Owner Author

Opened on the fork by mistake. Review is at yifanfeng97#149 — closing this.

@Frankie-Xu Frankie-Xu closed this Sep 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

docs: unresolved conflict markers in MCP tool table

1 participant