Skip to content

fix(mail): remove leftover conflict marker in skill docs#594

Merged
chanthuang merged 1 commit intomainfrom
fix/resolve-conflict-marker-in-mail-docs
Apr 21, 2026
Merged

fix(mail): remove leftover conflict marker in skill docs#594
chanthuang merged 1 commit intomainfrom
fix/resolve-conflict-marker-in-mail-docs

Conversation

@chanthuang
Copy link
Copy Markdown
Collaborator

@chanthuang chanthuang commented Apr 21, 2026

Summary

  • Remove <<<<<<< HEAD conflict marker accidentally left in skill-template/domains/mail.md and skills/lark-mail/SKILL.md by cb301a3

Test plan

  • Grep confirms no remaining conflict markers in the repo

Summary by CodeRabbit

  • Bug Fixes
    • Removed leftover Git merge conflict markers from documentation files, ensuring clean and uninterrupted content in mail-related skill documentation.

The <<<<<<< HEAD marker was accidentally left in mail.md and SKILL.md
by commit cb301a3 (draft preview URL). Remove it.

Change-Id: I6e1d5c0c66761302a3c4ee1421a16961b666bd80
@github-actions github-actions Bot added domain/mail PR touches the mail domain size/M Single-domain feat or fix with limited business impact labels Apr 21, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Apr 21, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 6358a431-b639-4340-91ca-64d88e34c12a

📥 Commits

Reviewing files that changed from the base of the PR and between 3e5dc32 and 6ebe00f.

📒 Files selected for processing (2)
  • skill-template/domains/mail.md
  • skills/lark-mail/SKILL.md
💤 Files with no reviewable changes (2)
  • skills/lark-mail/SKILL.md
  • skill-template/domains/mail.md

📝 Walkthrough

Walkthrough

Removed unresolved Git merge conflict markers (<<<<<<< HEAD) from two mail-related documentation files. The stray conflict artifacts in both skill-template and lark-mail documentation were cleaned up, restoring document coherence without altering substantive content.

Changes

Cohort / File(s) Summary
Mail Documentation Cleanup
skill-template/domains/mail.md, skills/lark-mail/SKILL.md
Removed Git merge conflict markers from the "命令选择" section in both files, restoring clean documentation without functional changes.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

Suggested labels

domain/mail, size/M

Suggested reviewers

  • haidaodashushu
  • zgz2048

Poem

🐰 A conflict marker swept away,
Two docs now clean as break of day,
The merge mess gone, the text flows free,
Like carrots fresh, so pure and neat! 🥕

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely describes the main change: removing leftover conflict markers from mail-related documentation files.
Description check ✅ Passed The description covers the summary and test plan sections well, though it deviates from the template by omitting the structured Changes section and Test Plan checkboxes.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/resolve-conflict-marker-in-mail-docs

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 21, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 61.69%. Comparing base (c13644a) to head (6ebe00f).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #594   +/-   ##
=======================================
  Coverage   61.69%   61.69%           
=======================================
  Files         402      402           
  Lines       35073    35073           
=======================================
  Hits        21639    21639           
  Misses      11429    11429           
  Partials     2005     2005           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions
Copy link
Copy Markdown

🚀 PR Preview Install Guide

🧰 CLI update

npm i -g https://pkg.pr.new/larksuite/cli/@larksuite/cli@6ebe00f072ea754dfece6c4d6601c9996461a07a

🧩 Skill update

npx skills add larksuite/cli#fix/resolve-conflict-marker-in-mail-docs -y -g

@chanthuang chanthuang merged commit 018eeb6 into main Apr 21, 2026
30 of 32 checks passed
@chanthuang chanthuang deleted the fix/resolve-conflict-marker-in-mail-docs branch April 21, 2026 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

domain/mail PR touches the mail domain size/M Single-domain feat or fix with limited business impact

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants