Squash and Merge on Github Mobile doesn't match the same on web

[nicksloan]

Select Topic Area

Product Feedback

Body

When I Squash & Merged a PR on Github mobile, I expected the same experience as web: a prompt to edit/confirm the squashed commit message. I wasn't given a prompt to do so, but even worse: the squashed commit message does not match the default behavior of Github on the web. All of the squashed commit messages (which we use to close issues) were omitted rather than being included in the commit message. There was no way to know that this would happen, and no good way to recover from the broken behavior (rewriting the history on our protected main branch is not an acceptable recovery path for this issue).

Unfortunately I have to give my team guidance to never merge commits from Github Mobile. This feature is unusable in its current state.

[iskae]

Hello @nicksloan 👋

Thanks so much for reaching out ❤️

I expected the same experience as web: a prompt to edit/confirm the squashed commit message

I believe you are right 👍 Currently we are not offering the users to change the commit message as part of Squash and Merge flow. It is a bit hidden when the user taps on the merge options button beside the Squash and Merge button as follows:

device-2023-04-04-103951.mp4

the squashed commit message does not match the default behavior of Github on the web. All of the squashed commit messages (which we use to close issues) were omitted rather than being included in the commit message.

Unfortunately I was not able to reproduce this behaviour. Can you please elaborate a bit more on this? 😊

In any case I have created an internal issue for improving the user flow for merging on mobile 🙇 Please stay tuned for our future updates 😊

Cheers!

[nicksloan]

I should have been more clear. By mobile, I mean the iOS app.

I've looked again, and I see that the option to edit the message does exist now behind a cog icon.

That said, I can't explain why the commit message when I squash and merged a commit previously doesn't seem to have matched the default format displayed in the view behind that icon.

[iskae]

That said, I can't explain why the commit message when I squash and merged a commit previously doesn't seem to have matched the default format displayed in the view behind that icon.

🤔 That is unfortunate. Let's see if we can come up with a better flow for our users 🙇

Thanks once again reaching out and please do not hesitate to do so in the future so that we can make our apps better ❤️

[MultiUniverse1974]

Delete Branch is the key

[MultiUniverse1974]

Delete Branch after what you just did on the video

[stevenh]

This just caught me out and as the original reporter said no way back so it classify it as quite a serious issue.

[stevenh]

I can also confirm the original posters issue with it not following the configured settings for what the default squash merge message is.

In my case it just contained the PR title and no other content, when it should have contained all commit messages concatenated, as per the repository settings.

[jpeach]

All of the squashed commit messages (which we use to close issues) were omitted rather than being included in the commit message

This reproduces 100% for me.

Here's a trivial PR, note that the commit has a message. I merged it on GitHub mobile - there was no prompt that showed the commit message and I got this result. Note, that the content of the commit message it missing.

[rebello95]

I just experienced this exact issue on connectrpc/connect-swift#182. I verified in the popup demonstrated above that the commit message was set to the original PR description (which is the default rule on the repository), but when I actually tapped the "Squash and merge" button, the commit message was dropped from the commit on main entirely.

I've seen this on other commits in the Connect-Swift repository as well, seems pretty consistent.

[richardallred]

@iskae any chance this can be addressed soon? is there a way to create an actual Bug somewhere? This makes merging PRs via mobile essentially broken for my team's workflow as we rely on the content of the PR description getting into the commit message on merge.

[iskae]

Hi folks 👋

We already have an internal issue for this and let me bump up the priority for it 🙇 I hope we get the chance to work on this soon and unblock everyone 😊

Please stay tuned 🙇

[iskae]

Hey folks 👋

We have been testing this on our end and we would love to dig this further to understand the exact problem. Here is a recording of the Squash and Merge flow on an Android emulator:

Screen_recording_20240516_112750.mp4

During our tests the PR body was also included in the commit message. Would it be possible to let us know the exact steps that you are taking @richardallred ? Also are you using an Android or an iOS device?

Thanks a bunch in advance 🙇

[richardallred]

I'm on iOS, I can try to make a similar recording of the bug there later today.