I think you choose at commit time if we want. Ian
On 27 Aug 2016 21:41, "Andrea Aime" <[email protected]> wrote: > I thought it was possible to choose at merge time if room squash or not. > Have I misread? > > Cheers > Andrea > > Il 27 Ago 2016 20:37, "Justin Deoliveira" <[email protected]> ha scritto: > > I would be slightly hesitant because it would mean you couldn’t have a > pull request with multiple commits even when it makes sense? Maybe that is > an ok thing to always have a single commit for a pull requests but I know I > often like to break up commits in a change when it makes logical sense. For > instance, when adding some new api and also adding a new implementation of > it I would tend to have one commit for the api change, and then another for > the implementation of it in whatever module. > > Just some food for thought. I have no strong opinion. > > On Sat, Aug 27, 2016 at 11:14 AM Andrea Aime <[email protected]> > wrote: > >> I'd certainly be +1 on that, it would have avoided me quite some >> manual squashing when merging pull requests >> >> Cheers >> Andrea >> >> >> On Sat, Aug 27, 2016 at 6:01 PM, Ian Turton <[email protected]> wrote: >> >>> Following this post https://github.com/blog/2141-squash-your-commits we >>> can set GitHub to offer the option of squashing merges on acceptance. >>> >>> It would save me fighting git every time I need to squash commits. >>> >>> Ian >>> >>> -- >>> Ian Turton >>> >>> ------------------------------------------------------------ >>> ------------------ >>> >>> _______________________________________________ >>> GeoTools-Devel mailing list >>> [email protected] >>> https://lists.sourceforge.net/lists/listinfo/geotools-devel >>> >>> >> >> >> -- >> == >> GeoServer Professional Services from the experts! Visit >> http://goo.gl/it488V for more information. >> == >> >> Ing. Andrea Aime >> @geowolf >> Technical Lead >> >> GeoSolutions S.A.S. >> Via di Montramito 3/A >> 55054 Massarosa (LU) >> phone: +39 0584 962313 >> fax: +39 0584 1660272 >> mob: +39 339 8844549 >> >> http://www.geo-solutions.it >> http://twitter.com/geosolutions_it >> >> *AVVERTENZE AI SENSI DEL D.Lgs. 196/2003* >> >> Le informazioni contenute in questo messaggio di posta elettronica e/o >> nel/i file/s allegato/i sono da considerarsi strettamente riservate. Il >> loro utilizzo è consentito esclusivamente al destinatario del messaggio, >> per le finalità indicate nel messaggio stesso. Qualora riceviate questo >> messaggio senza esserne il destinatario, Vi preghiamo cortesemente di >> darcene notizia via e-mail e di procedere alla distruzione del messaggio >> stesso, cancellandolo dal Vostro sistema. Conservare il messaggio stesso, >> divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od >> utilizzarlo per finalità diverse, costituisce comportamento contrario ai >> principi dettati dal D.Lgs. 196/2003. >> >> >> >> The information in this message and/or attachments, is intended solely >> for the attention and use of the named addressee(s) and may be confidential >> or proprietary in nature or covered by the provisions of privacy act >> (Legislative Decree June, 30 2003, no.196 - Italy's New Data Protection >> Code).Any use not in accord with its purpose, any disclosure, reproduction, >> copying, distribution, or either dissemination, either whole or partial, is >> strictly forbidden except previous formal approval of the named >> addressee(s). If you are not the intended recipient, please contact >> immediately the sender by telephone, fax or e-mail and delete the >> information in this message that has been received in error. The sender >> does not give any warranty or accept liability as the content, accuracy or >> completeness of sent messages and accepts no responsibility for changes >> made after they were sent or for other risks which arise as a result of >> e-mail transmission, viruses, etc. >> >> ------------------------------------------------------- >> ------------------------------------------------------------ >> ------------------ >> _______________________________________________ >> GeoTools-Devel mailing list >> [email protected] >> https://lists.sourceforge.net/lists/listinfo/geotools-devel >> > >
------------------------------------------------------------------------------
_______________________________________________ GeoTools-Devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geotools-devel
