4 ms·

Github still doesn't provide a means to mark a pull request as merged if you've locally rebased and pushed. https://github.com/isaacs/github/issues/2 https://g

Github still doesn't provide a means to mark a pull request as merged if you've locally rebased and pushed. https://github.com/isaacs/github/issues/2 https://github.com/isaacs/github/issues/2 https://github.com/isaacs/github/issues/548 https://github.com/isaacs/github/issues/548 This is what's happening with Signal's PRs. Here is an example: PR: https://github.com/signalapp/Signal-Android/pull/10266/commits https://github.com/signalapp/Signal-Android/pull/10266/commi... Commit in PR: https://github.com/signalapp/Signal-Android/pull/10266/commits/a2521518e53c186f4989042b21e8589f37cc8664 https://github.com/signalapp/Signal-Android/pull/10266/commi... Rebased and pushed commit: https://github.com/signalapp/Signal-Android/commit/6df839612dd560f685c30ce581c6b2ce559577fc https://github.com/signalapp/Signal-Android/commit/6df839612... Note that they have different commit references. Thus Github does not recognise this as a merge, and there's no way to explicitly tell Github that you did merge it.

greysonp 6y ago
Hi, there, Signal Android developer here. This is correct. Our process is that we work in a pre-release branch, and then merge that to master when we make a release. So GitHub doesn't usually recognize it as a merge, but we always keep the original authorship and whatnot.
- scns 6y ago
  Hey there, would be great if you reference these merges in the issues so it would be visible to everyone (and especially the devs who put in the work) that the code is used.
- jakear 6y ago
  Can’t you just change the merge target to the prerelease branch?
  - Benjamin_Dobell 6y ago
    Maintainers can't. Only the PR owner can. For that to work the PR owner has to know which branch to target (assuming it's public). Unless the PR creator somehow knows which release their PR is going to be included in, with a guarantee it'll be merged in said release, then it's just not possible for the PR creator to target the correct branch.
    - Nullabillity 6y ago
      > Maintainers can't. Only the PR owner can. Just tried it, seems to work fine for me..?
      - LukeShu 6y ago
        When filing a PR there's a "allow maintainers to edit the PR" checkbox (I don't recall the exact wording). If the PR owner doesn't check it, the maintainer can't change the target branch.
    - jakear 6y ago
      It’s a bit undiscoverable, but if you click the edit title button it will actually allow you to edit the base branch as well. Sibiling comment said this might be opt-out-able, but at least in ms/vscode no one seems to opt-out.
- kuschku 6y ago
  You could include "Closes #123" or "Merges #123" or "Fixes #123" in the commit message of the merge commit, and GitHub will link it, and currently close it (it doesn't actually consider it merged, but it at least auto-closes and links)
est31 6y ago
In one of the projects I was in, we did the same but then made a comment with the merged commit hash so that folks can check it out.
swiley 6y ago
Ah, it turns out Github is the obnoxious one.

greysonp 6y ago

Hi, there, Signal Android developer here. This is correct. Our process is that we work in a pre-release branch, and then merge that to master when we make a release. So GitHub doesn't usually recognize it as a merge, but we always keep the original authorship and whatnot.

scns 6y ago
Hey there, would be great if you reference these merges in the issues so it would be visible to everyone (and especially the devs who put in the work) that the code is used.
jakear 6y ago
Can’t you just change the merge target to the prerelease branch?
- Benjamin_Dobell 6y ago
  Maintainers can't. Only the PR owner can. For that to work the PR owner has to know which branch to target (assuming it's public). Unless the PR creator somehow knows which release their PR is going to be included in, with a guarantee it'll be merged in said release, then it's just not possible for the PR creator to target the correct branch.
  - Nullabillity 6y ago
    > Maintainers can't. Only the PR owner can. Just tried it, seems to work fine for me..?
    - LukeShu 6y ago
      When filing a PR there's a "allow maintainers to edit the PR" checkbox (I don't recall the exact wording). If the PR owner doesn't check it, the maintainer can't change the target branch.
  - jakear 6y ago
    It’s a bit undiscoverable, but if you click the edit title button it will actually allow you to edit the base branch as well. Sibiling comment said this might be opt-out-able, but at least in ms/vscode no one seems to opt-out.
kuschku 6y ago
You could include "Closes #123" or "Merges #123" or "Fixes #123" in the commit message of the merge commit, and GitHub will link it, and currently close it (it doesn't actually consider it merged, but it at least auto-closes and links)

est31 6y ago

In one of the projects I was in, we did the same but then made a comment with the merged commit hash so that folks can check it out.

swiley 6y ago

Ah, it turns out Github is the obnoxious one.