[BUG] Merge dialog keeps the commit message of the previous merge method after switching between "Squash and merge" and "Create a merge commit" #213354
Replies: 2 comments
|
Thank you for your interest in contributing to our community! We currently only accept discussions created through the GitHub UI using our provided discussion templates. Please re-submit your discussion by navigating to the appropriate category and using the template provided. This discussion has been closed because it was not submitted through the expected format. If you believe this was a mistake, please reach out to the maintainers. |
0 replies
|
Duplicate of https://github.com/orgs/community/discussions/212393, where I added my details. Please follow up there. |
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
What I expected
When I switch the merge method in the merge box, the "Commit message" and "Extended description" fields in the confirm dialog are reset to the defaults of the newly selected method.
What happens
The button changes, but the text fields keep the content of the previously selected method. This happens in both directions, and the resulting commit really carries the wrong message.
(#N)plus the* commitlist) instead ofMerge pull request #N from owner/branch. I merged like this once and the merge commit onmainhas two parents but the squash message.Merge pull request #N from owner/branchand the description holds the PR title (the merge commit default). For a PR with one commit the squash default would be the PR title with(#N)and an empty description.Steps to reproduce
Merge pull request #N from owner/branch. Confirm the merge and check the commit on the base branch.A reload does not help, because the bug shows up on a freshly loaded page as soon as the method differs from the preselected one.
Environment
Mock-up of the second case (screenshots are from a private repository, so this is a text reproduction)
The button says squash, the text is the merge commit default.
Suggestion
Reset both text fields to the default of the selected method whenever the method changes, unless the user has edited them. If they were edited, ask before discarding the edit, or keep the edit and show a hint.
All reactions