Daan, I disagree regarding the squash. As I read through the list of commits, they read as a series of small commits that do not explain the overall change. When this batch of small of commits is merged into the large history of master, the intent of this work will be lost. In my opinion, squashing them into one commit with a descriptive commit message will be much more helpful to people trying to comprehend the work at some point in the future.
Thanks, -John --- John Burwell (@john_burwell) VP of Software Engineering, ShapeBlue (571) 403-2411 | +44 20 3603 0542 http://www.shapeblue.com > On Jun 29, 2015, at 5:30 AM, Daan Hoogland <daan.hoogl...@gmail.com> wrote: > > Do not squash commits and hide history unless it makes reading it much > and obviously clearer. It is only good in my not so humble opinion in > case of to and fro commits where a thing has been reverted and > reapplied and reverted again and so on. > > Also do not rebase commits but make merge commits, this make seeing > what happened when much easier and also make reverting of big chunks > of work easier: if it seems to work merge, if it turns out it doesn't > revert the merge fix and merge again. > > €0,02 > > > On Mon, Jun 29, 2015 at 11:07 AM, wilderrodrigues <g...@git.apache.org> wrote: >> Github user wilderrodrigues commented on the pull request: >> >> https://github.com/apache/cloudstack/pull/527#issuecomment-116545842 >> >> I created the issue and added to the last commit. Did it last week: >> >> https://issues.apache.org/jira/browse/CLOUDSTACK-8589 >> >> Perhaps you missed that. >> >> Concerning squashed commits, ew should really have discussed about it >> when you were here. I'm 100% if I squash my atomic commits next time you >> guys will complain. It seems I haven't been clear enough about that yet. >> >> @remibergsma @miguelaferreira Would you guys give your input on these >> "squash commits" matter? I'm a bit tired of this discussion. For me, >> squashed commits won't make a review easier, unless there is no review at >> all or if the committer has changes a couple of lines in a bash script. >> >> What I would like to see is people testing changes the way I do. >> >> Cheers, >> Wilder >> >> >> --- >> If your project is set up for it, you can reply to this email and have your >> reply appear on GitHub as well. If your project does not have this feature >> enabled and wishes so, or if the feature is enabled but not working, please >> contact infrastructure at infrastruct...@apache.org or file a JIRA ticket >> with INFRA. >> --- > > > > -- > Daan Find out more about ShapeBlue and our range of CloudStack related services IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/> CloudStack Software Engineering<http://shapeblue.com/cloudstack-software-engineering/> CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/> CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/> This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
