Uh oh!
There was an error while loading. Please reload this page.
[WIP] Fix stale branch causing create_pull_request patch failures - #25
Merged
Conversation
Replace simple merge-from-main with reset-if-merged approach in Step 3 of the autoloop workflow. When a program branch's changes have already been merged into main (git diff produces no output), the branch is reset to origin/main instead of merging. This prevents format-patch from generating patches with already-merged commits that cause git am failures. Fixes#69 Agent-Logs-Url: https://github.com/githubnext/autoloop/sessions/1aea5829-61b7-4958-bf7e-56e7bd4f6d9d Co-authored-by: mrjf <180956+mrjf@users.noreply.github.com>
mrjf
marked this pull request as ready for review
April 4, 2026 04:56
Uh oh!
There was an error while loading. Please reload this page.
Copilot stopped work on behalf of mrjf due to an error
April 4, 2026 04:57
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
.github/workflows/autoloop.md(line 694) to add reset-if-merged logic before falling back to mergeworkflows/autoloop.mdto keep both in sync