lasdf1234 opened a new pull request, #12276: URL: https://github.com/apache/gravitino/pull/12276
### What changes were proposed in this pull request? Add a standalone GitHub Actions workflow `conflict-marker-check` that fails when a PR or push introduces unresolved git conflict markers (`<<<<<<< `, whole-line `=======`, `>>>>>>> `). This is intentionally separate from `build.yml` so path filters cannot skip it. Auto cherry-pick can still open conflict PRs for manual resolution; this check makes CI fail until the markers are removed. ### Why are the changes needed? `cherry-pick-branch.yml` commits conflicted files with markers and opens a PR when cherry-pick fails. GitHub then reports the PR as mergeable, and existing CI can stay green because markers in docs/source are just text. Example: #12267 left `<<<<<<< HEAD` in `docs/security/access-control.md` while CI passed. This check makes that class of PR fail until markers are resolved. Fix: #(issue) ### Does this PR introduce _any_ user-facing change? No. CI-only. ### How was this patch tested? - Validated marker patterns against the conflict hunks from #12267. - Workflow uses `git diff --check` on the PR/push range plus an explicit line-start scan of changed files. Made with [Cursor](https://cursor.com) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
