Mike- FWIW I sometimes work off my own branches which combine open PR's so a rebase squashing PR comments addressed can be tedious.
Better to give PR's extra testing and improve the binary release (yay!) than to stress over a picture-perfect rewritten history. A On 17 Jun 2015 14:23, "Mike Zaccardo" <[email protected]> wrote: > I should say "descriptiveness and brevity." > On Jun 17, 2015 9:21 AM, "Mike Zaccardo" <[email protected]> > wrote: > > > Thanks, so it sounds like it's about striking a balance between > > descriptiveness and clarity. I'll figure out what's sensible to combine. > > On Jun 17, 2015 9:14 AM, "Martin Harris" < > [email protected]> > > wrote: > > > >> It seems to be general practice to squash commits into a sensible set of > >> commits before submitting a PR. When addressing PR comments, we also > >> (where > >> sensible) squash these into the appropriate commits before doing a `git > >> push -f`. The latter prevents an abundance of commit messages that just > >> read 'PR comments addressed' > >> > >> Cheers > >> > >> M > >> > >> On 17 June 2015 at 14:11, Mike Zaccardo < > [email protected]> > >> wrote: > >> > >> > Hi dev, > >> > > >> > Is there a general policy / rule of thumb for commit squashing? In my > >> past > >> > experience I've always left all commits intact as an audit trail, as > >> > trivial as some may be. However, I've noticed a fair amount of > squashing > >> > here, so is that acceptable / encouraged? > >> > > >> > Thanks, > >> > Mike > >> > > >> > -- > >> > Cloudsoft Corporation Limited, Registered in Scotland No: SC349230. > >> > Registered Office: 13 Dryden Place, Edinburgh, EH9 1RP > >> > > >> > This e-mail message is confidential and for use by the addressee only. > >> If > >> > the message is received by anyone other than the addressee, please > >> return > >> > the message to the sender by replying to it and then delete the > message > >> > from your computer. Internet e-mails are not necessarily secure. > >> Cloudsoft > >> > Corporation Limited does not accept responsibility for changes made to > >> this > >> > message after it was sent. > >> > > >> > Whilst all reasonable care has been taken to avoid the transmission of > >> > viruses, it is the responsibility of the recipient to ensure that the > >> > onward transmission, opening or use of this message and any > attachments > >> > will not adversely affect its systems or data. No responsibility is > >> > accepted by Cloudsoft Corporation Limited in this regard and the > >> recipient > >> > should carry out such virus and other checks as it considers > >> appropriate. > >> > > >> > >> > >> > >> -- > >> Martin Harris > >> Lead Software Engineer > >> Cloudsoft Corporation Ltd > >> www.cloudsoftcorp.com > >> > >> -- > >> Cloudsoft Corporation Limited, Registered in Scotland No: SC349230. > >> Registered Office: 13 Dryden Place, Edinburgh, EH9 1RP > >> > >> This e-mail message is confidential and for use by the addressee only. > If > >> the message is received by anyone other than the addressee, please > return > >> the message to the sender by replying to it and then delete the message > >> from your computer. Internet e-mails are not necessarily secure. > Cloudsoft > >> Corporation Limited does not accept responsibility for changes made to > >> this > >> message after it was sent. > >> > >> Whilst all reasonable care has been taken to avoid the transmission of > >> viruses, it is the responsibility of the recipient to ensure that the > >> onward transmission, opening or use of this message and any attachments > >> will not adversely affect its systems or data. No responsibility is > >> accepted by Cloudsoft Corporation Limited in this regard and the > recipient > >> should carry out such virus and other checks as it considers > appropriate. > >> > > > > -- > Cloudsoft Corporation Limited, Registered in Scotland No: SC349230. > Registered Office: 13 Dryden Place, Edinburgh, EH9 1RP > > This e-mail message is confidential and for use by the addressee only. If > the message is received by anyone other than the addressee, please return > the message to the sender by replying to it and then delete the message > from your computer. Internet e-mails are not necessarily secure. Cloudsoft > Corporation Limited does not accept responsibility for changes made to this > message after it was sent. > > Whilst all reasonable care has been taken to avoid the transmission of > viruses, it is the responsibility of the recipient to ensure that the > onward transmission, opening or use of this message and any attachments > will not adversely affect its systems or data. No responsibility is > accepted by Cloudsoft Corporation Limited in this regard and the recipient > should carry out such virus and other checks as it considers appropriate. > -- Cloudsoft Corporation Limited, Registered in Scotland No: SC349230. Registered Office: 13 Dryden Place, Edinburgh, EH9 1RP This e-mail message is confidential and for use by the addressee only. If the message is received by anyone other than the addressee, please return the message to the sender by replying to it and then delete the message from your computer. Internet e-mails are not necessarily secure. Cloudsoft Corporation Limited does not accept responsibility for changes made to this message after it was sent. Whilst all reasonable care has been taken to avoid the transmission of viruses, it is the responsibility of the recipient to ensure that the onward transmission, opening or use of this message and any attachments will not adversely affect its systems or data. No responsibility is accepted by Cloudsoft Corporation Limited in this regard and the recipient should carry out such virus and other checks as it considers appropriate.
