lasdf1234 opened a new issue, #12277: URL: https://github.com/apache/gravitino/issues/12277
### Version main branch ### Describe what's wrong When auto cherry-pick fails with conflicts, `.github/workflows/cherry-pick-branch.yml` commits the conflicted files (including git conflict markers such as `<<<<<<< HEAD`) and opens a PR for manual resolution. That PR is still reported as mergeable by GitHub, and existing CI can stay green, because conflict markers are treated as ordinary file content. There is no check that fails the PR while unresolved markers remain. This makes it easy to accidentally merge a cherry-pick PR that still contains conflict markers. ### Error message and/or stacktrace Example from #12267 (`docs/security/access-control.md`): ```text <<<<<<< HEAD ### Role ... ======= Everything sits under a metalake... >>>>>>> e6f3a47f4 (...) ``` PR description correctly said **Has conflicts - manual resolution required**, but CI checks passed and GitHub mergeability was clean. ### How to reproduce 1. Merge a PR to `main` with a `branch-1.3` (or similar) cherry-pick label, where the commit conflicts on the target branch. 2. Wait for `auto-cherry-pick.yml` / `cherry-pick-branch.yml` to open the conflict PR. 3. Observe that the branch contains `<<<<<<<` / `=======` / `>>>>>>>` markers, while CI can still pass. ### Additional context Expected behavior: cherry-pick may still open a PR for humans to resolve, but CI should fail until conflict markers are removed. Related: #12267, #12276 -- 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]
