fix(mcb): stabilize from clean origin/main with conflict marker CI check - #217
fix(mcb): stabilize from clean origin/main with conflict marker CI check#217marlon-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 |
a37c16f to
daeaff2
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| 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." |
2 participants
Stabiliza mcb a partir de origin/main clean.
Análise:
Summary by cubic
Adds a CI workflow that fails pull requests to
mainwhen they contain merge conflict markers, so broken merges get caught before landing.main..venv,target,dist,.cache,_vendor).Written for commit daeaff2. Summary will update on new commits.