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
