Clarify --no-edit flag usage in release workflow merge fallback#429
Closed
Copilot wants to merge 1 commit intothomasturrell-patch-3from
Closed
Clarify --no-edit flag usage in release workflow merge fallback#429Copilot wants to merge 1 commit intothomasturrell-patch-3from
Copilot wants to merge 1 commit intothomasturrell-patch-3from
Conversation
Copilot
AI
changed the title
[WIP] Update release process to improve merge conflict handling
Clarify --no-edit flag usage in release workflow merge fallback
Nov 25, 2025
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 free
to 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.
Description
Addresses review feedback on #427 regarding the
--no-editflag in the merge fallback logic.The
--no-editflag is the correct choice for CI environments - it prevents Git from opening an interactive editor for the merge commit message. While-mwith a custom message would also work,--no-editwith Git's default merge message is appropriate for this automated workflow.No code changes required - confirmed existing implementation is correct.
Resolves feedback from #427 (comment)
Checklist:
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.