Skip to content

docs: remove unresolved merge conflict markers from README - #1754

Open
xiakong130 wants to merge 1 commit into
reframe-oss:mainfrom
xiakong130:docs/fix-readme-merge-conflict-markers
Open

docs: remove unresolved merge conflict markers from README#1754
xiakong130 wants to merge 1 commit into
reframe-oss:mainfrom
xiakong130:docs/fix-readme-merge-conflict-markers

Conversation

@xiakong130

Copy link
Copy Markdown

What changed

Removed three unresolved git merge conflict markers (<<<<<<< HEAD, =======, >>>>>>> f3b7ebe...) from README.md that were accidentally committed and rendered as literal text on the GitHub README page.

Why

The conflict markers appeared between the badge section and the "Built With" section, making them visible to anyone viewing the repository README. This is a documentation quality issue.

How I checked

  • Verified the diff only removes the three conflict marker lines
  • Confirmed no remaining conflict markers via grep
  • Checked that the <div> open/close structure is still correct after the fix

@vercel

vercel Bot commented Aug 27, 2026

Copy link
Copy Markdown

@xiakong130 is attempting to deploy a commit to the magic-peach1's projects Team on Vercel.

A member of the Team first needs to authorize it.

@github-actions

Copy link
Copy Markdown
Contributor

⚠️ PR Format Issues — @xiakong130

Please fix the following before your PR can be reviewed:

  • ⚠️ No linked issue found. Add Closes #<issue-number> to your PR description.

Push new commits after fixing — this comment will update automatically.

📖 CONTRIBUTING.md

@github-actions

Copy link
Copy Markdown
Contributor

👋 Thanks for your PR, @xiakong130!

Welcome to Reframe — a browser-based video editor built for everyone 🎬

What happens next

  1. 🤖 Automated checks — build & TypeScript typecheck will run automatically
  2. Vercel preview — a preview deployment will be created (requires maintainer authorization for fork PRs)
  3. 👀 Code review — a maintainer will review your changes
  4. 🚀 Merge — once approved, your PR will be merged!

Quick checklist

  • PR title follows Conventional Commits (e.g. feat: add dark mode)
  • Linked the issue this PR closes (e.g. Closes #123)
  • Tested the changes locally (bun run dev)
  • Build passes (bun run build)

Useful links

Happy coding! 🎉

@github-actions github-actions Bot added level:beginner Beginner level - 20 pts type:bug Bug fix type:docs Documentation labels Aug 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

level:beginner Beginner level - 20 pts type:bug Bug fix type:docs Documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant