Repository navigation
Should the thread side panel's Merge button follow Default merge method? #19028
Unanswered
ramapitecusment
asked this question in
Q&A
Replies: 1 comment
|
The same source-level inconsistency is still present in v0.1.0. In the compact thread-details row, resolveSelectedMergeMethod(allowedPullRequestMergeMethods(detail), "merge")The confirmation then passes that selected method to the merge action. That component does not consult the configured default merge method, so your observation is consistent with the released source too. For now, use the full pull-request panel and check that its action says Squash and merge before confirming. I haven't independently reproduced this on Azure DevOps, and the source alone doesn't establish whether the difference was intentional. A bug report linking this discussion and those two locations would give maintainers a concrete place to check. |
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.
Default merge method is set to Squash (Settings → Source Control), and the pull request page follows it: its main button reads "Squash and merge".
The compact Merge button on the pull request card in a thread's right panel seems to always use
mergeinstead. In the shipped desktop bundle (0.0.46-nightly.20261013.3053) that card picks its method as "mergeif the host allows it, otherwise the first allowed method". It does not read the default setting or the last used method, and its tooltip and confirmation dialog are built from that value ("Merge this pull request (merge)", "This merges # using merge.").On an Azure DevOps repository, where both
mergeandsquashare allowed, this means the card always creates a merge commit. A pull request I merged from that card did become a two-parent merge commit, but I had changed the setting less than a minute earlier, so the statement above rests on reading the bundle rather than on a clean repro.Is this intended, for example because the card is meant to be a plain quick merge? Or was the card missed when #8088 added the default merge method (see #11926)?
If it is an oversight, I can file a bug report with the details.
All reactions