Skip to content

fix(mcb): stabilize from clean origin/main with conflict marker CI check - #219

Closed
marlon-costa-dc wants to merge 1 commit into
mainfrom
fix/mcb-stable
Closed

fix(mcb): stabilize from clean origin/main with conflict marker CI check#219
marlon-costa-dc wants to merge 1 commit into
mainfrom
fix/mcb-stable

Conversation

@marlon-costa-dc

@marlon-costa-dc marlon-costa-dc commented Aug 28, 2026

Copy link
Copy Markdown
Collaborator

Stabiliza mcb a partir de origin/main clean.


Summary by cubic

Adds a conflict-marker-check workflow that fails pull requests to main when 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.

Review in cubic

Broken merge PR #202 (69832e7) already reverted by c86edc2 on main.
No conflict markers on main. CI: 8 workflows (7 existing + 1 new).
@qodo-code-review

Copy link
Copy Markdown
Contributor

ⓘ Qodo reviews are paused because the subscription is no longer active. Ask your workspace admin to reactivate the subscription to resume reviews. Manage billing

@coderabbitai

coderabbitai Bot commented Aug 28, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 494143da-8b46-42b4-bcdb-be1e37931d96

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

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.

@marlon-costa-dc
marlon-costa-dc deleted the fix/mcb-stable branch August 28, 2026 21:04
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.

1 participant