> On Oct 24, 2016, at 1:58 PM, Clemens Lang <c...@macports.org> wrote: > > I don't think we should mandate a complex "run these magic git commands" > workflow. Making things complicated will just make them go wrong.
Agreed. >> On Mon, Oct 24, 2016 at 07:47:18PM +0200, Mojca Miklavec wrote: >> >> (My preference would be to keep linear history for master and not to >> keep ten broken revisions of a Portfile resulting from stepwise >> improvements in a pull request, but it would be nice to do some >> testing first.) > > Yes, that's also my preference. So we can agree on: > - rebase when merging PRs > - rewrite history on PR branches until it looks good +1 to both (so +2, I guess?). We want to avoid merge commits, and we want the history that is ultimately added to master to be clean and understandable. The precise method of achieving this (squash merging, interactive rebasing, etc.) is not really important. vq _______________________________________________ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
