Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Delete `./scripts/commit-pr.sh` #1188
I thought we discussed this back when Github first added the Rebase and Merge feature, and there was some argument against it. I can't find documentation of any such conversation (was it during a meeting?) so I'm +1.
Related but slightly offtopic, we may want to update the contributing doc about issue numbers in commit and pull request titles. When there is only one commit to a PR and the PR only references one issue, I've been putting [ADAM-issue#] in the PR title and not the commit message. When the PR covers more than one issue, I've left [ADAM-issue#] from the PR title. If the PR contains more than one commit, I've tried to add [ADAM-issue#] to the commit message. That seems to be roughly the same approach you have been taking? If so, can we codify it in the doc?
In any case, because sometimes PRs are closed via merging and sometimes closed manually, there's no clear way to gather everything for the changelog, which I assume is the point behind the [ADAM-issue#] tagging. See also #936.
The trouble with the original feature was that they added squash and merge, not rebase and merge. This week, they added rebase and merge in addition to squash and merge (and plain merge).
+1. I can open a PR for that. My approach is to always start the commit with "[ADAM-issue#]", and to then have "Resolves #issue" in the body of the commit message (which will auto-close the issue once the commit pushes to master).