fix(mcb): stabilize from clean origin/main with conflict marker CI check - #219
fix(mcb): stabilize from clean origin/main with conflict marker CI check#219marlon-costa-dc wants to merge 1 commit into
Conversation
|
ⓘ Qodo reviews are paused because the subscription is no longer active. Ask your workspace admin to reactivate the subscription to resume reviews. Manage billing |
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
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 |
Stabiliza mcb a partir de origin/main clean.
Summary by cubic
Adds a
conflict-marker-checkworkflow that fails pull requests tomainwhen merge conflict markers are found in tracked files, preventing broken merges like PR #202 from landing again.Written for commit 702bfc7. Summary will update on new commits.