fix(changelog): remove leftover merge conflict markers from v0.15.2 sync - #305
Conversation
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
Warning Review limit reached
More reviews will be available in 55 minutes and 35 seconds. Learn how PR review limits work. Your organization has run out of usage credits. Purchase more credits in the billing tab to continue. ⌛ How to resolve this issue?After more reviews become available, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available. Please see our Fair Usage Limits Policy for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Pro Run ID: 📒 Files selected for processing (1)
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
Summary
The v0.15.2 sync (#302) committed
CHANGELOG.mdwith unresolved merge conflict markers (<<<<<<< HEAD/=======/>>>>>>> origin/main). This makes the release PR #304 (develop→main) reportCONFLICTING.This PR restores
CHANGELOG.mdondevelopto matchmainexactly (the canonical version — semantic-release writes the changelog onmain). Identical content on both sides means #304 merges cleanly.Diff: 3 deleted lines (the markers), nothing else.
Unblocks
🤖 Generated with Claude Code