Repository navigation
Failure to create PR due to merge conflict #56567
Description
This run https://github.com/fabulous-dev/Fabulous/actions/runs/33156879260 failed to create a PR and instead created an issue fabulous-dev/Fabulous#1186
This error was given:
Original error: ERR_SYSTEM: pushSignedCommits: failed to rebase commit range onto current GraphQL parent (https://github.com/fabulous-dev/Fabulous/commit/7d858e1a8238d2dd2fc84f2f6e7b9afbf1b9f648). Resolve conflicts by rebasing/cherry-picking locally and retry. Root cause: Auto-merging CHANGELOG.md CONFLICT (content): Merge conflict in CHANGELOG.md Rebasing (1/1) error: could not apply d3a36cf9... Fix StackArray3.sortInPlace using wrong key for third element hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm (conflicted_files)", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". hint: Disable this message with "git config set advice.mergeConflict false" Could not apply d3a36cf9... # Fix StackArray3.sortInPlace using wrong key for third element
It looks to me like this is a merge conflict due to some update to master/main during the process and probably shouldn't have prevented the creation of the PR, which should have been created in "conflicts" state. At very least a "click to create this pull requqest link" should have been offered in the fallback issue, but really we should have been able to create the PR.
Activity