Hi > On 22. Aug 2019, at 22:25, Marshall Schor <[email protected]> wrote: > > Any reason not to protect *all* branches from force push?
You'll appreciate the freedom of being able to force-push into pull requests to rewrite their history, e.g. if you want to amend a bad commit comment or rebase a PR to a different branch or whatever. > I see in my uima commits folder messages from [email protected], which say > things like: > This is an automated email from the ASF dual-hosted git repository. > > rec pushed a commit to branch 3.0.x > in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git > ... and then details, including the message. > > So it appears that commits are generating messages to the commits list. Ok, good :) > What is the reason for your view on rebase or squash? What I vaguely > understand > is that if you have a git change process that branches, does work (possibly > with > many commits) and then eventually, does a merge of some kind with the base, > that > these things make the commit look like one thing (they loose the incremental > history of what you were doing while working on the branch). I guess some > people like the main branch to not have all the start/stop/change-your-mind/ > set > of little commits, in the branch, preserved in the main. > > Is your comment "please don't *force* ..." mean you advocate we allow all > styles > of pull request merging? I tend to like the merge-commit approach because it preserves the individual commits and that means that the commit details apply at a finer granularity. If you squash a large PR with many commits, you'll end up with a huge commit message and little clue as to which parts of the code the commit comments actually apply do, e.g. when doing a "blame" operation. Cf. my earlier comments on merge vs squash vs rebase: - http://mail-archives.apache.org/mod_mbox/uima-dev/201906.mbox/%[email protected]%3e - http://mail-archives.apache.org/mod_mbox/uima-dev/201906.mbox/%[email protected]%3e Cheers, -- Richard
