Skip to content

test: recovered native Mergify qualification (do not merge) - #5129

Closed
huangruiteng wants to merge 1 commit into
mainfrom
codex/mergify-qualification-5082-resync
Closed

huangruiteng wants to merge 1 commit into
mainfrom
codex/mergify-qualification-5082-resync

Conversation

@huangruiteng

Copy link
Copy Markdown
Collaborator

Disposable native-event qualification for #5082 after repository metadata synchronization. Do not merge. Reuses the same signed synthetic documentation conflict as #5126, opens directly as a non-draft against main, and sends no refresh command. Verify automatic conflict comment and label, then signed recovery and automatic cleanup. Close the PR and delete its owned temporary branch afterward. No production content is merged.

Signed-off-by: huangruiteng <14976749+huangruiteng@users.noreply.github.com>
@huangruiteng huangruiteng changed the title test: native Mergify events after repository sync (do not merge) test: re-evaluate known Mergify conflict after repository sync (do not merge) Sep 26, 2026
@mergify

mergify Bot commented Sep 26, 2026

Copy link
Copy Markdown

This pull request has merge conflicts with main and cannot be merged
until they are resolved. Please rebase or merge the base branch, @huangruiteng.

Choose the remote for the base repository, not an out-of-date fork.
For a fork clone, first inspect git remote -v; upstream must point
to https://github.com/loopx-project/loopx.git. If it is absent, add it
with git remote add upstream https://github.com/loopx-project/loopx.git.
Then run:

git fetch upstream
git rebase upstream/main
# Resolve each conflict, git add the resolved files, then git rebase --continue.
git push --force-with-lease origin HEAD

For a same-repository clone whose origin points to
https://github.com/loopx-project/loopx.git, use origin instead of
upstream for fetch/rebase. If you prefer merging the base, use
git merge <base-remote>/main and push normally.

Keep the DCO Signed-off-by trailer on every commit when you rebase.
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify Bot added the needs-rebase Mergify: the pull request has merge conflicts with its base branch label Sep 26, 2026
@huangruiteng huangruiteng changed the title test: re-evaluate known Mergify conflict after repository sync (do not merge) test: recovered native Mergify qualification (do not merge) Sep 26, 2026
@mergify mergify Bot removed the needs-rebase Mergify: the pull request has merge conflicts with its base branch label Sep 26, 2026
@huangruiteng
huangruiteng force-pushed the codex/mergify-qualification-5082-resync branch from 947468f to 9052f31 Compare September 26, 2026 16:42
@huangruiteng
huangruiteng deleted the codex/mergify-qualification-5082-resync branch September 26, 2026 16:46
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