fix(mcb): stabilize from clean origin/develop with conflict marker CI check - #216
Closed
marlon-costa-dc wants to merge 4 commits into
Closed
fix(mcb): stabilize from clean origin/develop with conflict marker CI check#216marlon-costa-dc wants to merge 4 commits into
marlon-costa-dc wants to merge 4 commits into
Conversation
chore: promote develop to main (edgevec actor + git env fixes; mcb-jdwv, mcb-88o2)
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 |
|
Warning Review limit reachedNext included review available in 15 minutes. View limit detailsLimit details: You’ve used the included review currently available. You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. Review configuration: ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
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 |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+9
to
+23
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: true | ||
| - name: Check for merge conflict markers | ||
| run: | | ||
| markers=$(git grep -l '<<<<<<< HEAD\|=======$' -- \ | ||
| $(git ls-files | grep -vE '\.venv/|target/|dist/|\.cache/|_vendor/' | tr '\n' ' ') 2>/dev/null || true) | ||
| if [ -n "$markers" ]; then | ||
| echo "::error::Merge conflict markers found in tracked files:" | ||
| echo "$markers" | ||
| exit 1 | ||
| fi | ||
| echo "No conflict markers found." |
marlon-costa-dc
force-pushed
the
fix/stable-mcb
branch
from
August 28, 2026 20:59
a37c16f to
daeaff2
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stabiliza mcb a partir de origin/develop clean.
Análise da situação:
Summary by cubic
Adds a CI workflow that fails pull requests to
mainwhen merge conflict markers are found in tracked files, preventing broken merges from reaching the default branch. The check ignores virtualenv, build, and vendor folders to avoid false positives.Written for commit daeaff2. Summary will update on new commits.