> On Nov 14, 2016, at 2:44 PM, Eric A. Borisch <ebori...@macports.org> wrote: > >> On Mon, Nov 14, 2016 at 1:17 PM, Rainer Müller <rai...@macports.org> wrote: >> >> I am not opposed to enabling "Squash and merge", but we have no >> guide for maintainers explaining the pull request workflow. If we >> had this, it could explain the differences between the "Rebase and >> merge" and "Squash and merge" button and when to use what. > > Well, I vote for some education (guide section) plus enabling the > squash and merge button.
We have a chicken-and-egg problem insofar as we don't really understand how PRs work, so we cannot document how they work. I "botched"* the PR under discussion because force-pushing to the PR branch did not do what I had observed in previous PRs. I am not particularly keen on enabling squash-and-merge because it might encourage developers to (a) not bother testing and (b) write poor commit messages on the GitHub web page. * I say "botched" because I don't really care that that PR has been resolved as non-"Merged". vq
