Thanks Bruno, I'm starting to follow your approach. +1 El lun., 3 dic. 2018 a las 5:24, Bruno Baptista (<[email protected]>) escribió:
> Hi folks, > > I'm also not a big fan of squashing... > > I do however understand the need to easily find commits from a certain > PR for portability reasons. > > There are 2 mitigating steps that can be done: > > 1. Always put the jira issue in the beginning of all comments, like: > "TOMEE-1234 - some comment" > 2. Squash commits that don't add anything to the history like, typos > and minor changes. > > This way, we can retain the dev's reasoning and make PRs easily portable > to other branches. > > Cheers. > > Bruno Baptista > https://twitter.com/brunobat_ > > > On 30/11/18 15:41, César Hernández Mendoza wrote: > > Like in many things in life, we all have different opinions, you can find > > in this thread "Why we don't have Jira and Github integration?" why I > > prefer to have cleaner branches with squashed commits. > > > > One thing is building something, but another task is troubleshooting > > something someone else did and the time each person takes to do that will > > depend on different factors. > > Doing git bisect in a huge branch with +5 commits per functionality is > > something I don't wish to others. > > > > > > > > > > > > > > El vie., 30 nov. 2018 a las 9:23, Richard Monson-Haefel (< > > [email protected]>) escribió: > > > >> Thanks, Guys! I really don't see the point in squashing commits as you > >> describe it. Seems like it cooks the books on what is actually being > done. > >> Not sure why anyone would care if a PR has multiple commits. In fact, > that > >> would make it far easier to evaluate the PR, I believe. Anyway, I get it > >> now and I thank everyone for stepping up to explain it to me but unless > >> there is some mandate for it, I won't be squashing commits. > >> > >> On Fri, Nov 30, 2018 at 8:55 AM Romain Manni-Bucau < > [email protected]> > >> wrote: > >> > >>> Hi Richard, > >>> > >>> if you have 3 commit in your PR you create a single one "squashing" > them > >> 3 > >>> (or you can select just 2 if you want) > >>> > >>> Some people are fan of it, some people hate it cause it break the > history > >>> and the "thinking" of the devs so you loose precious information (yes > i'm > >>> in this last part....being said at the end you can't rely on the > history > >>> whatever effort you put in the writing of it). I have a colleague who > is > >>> quite interesting on that, he says "I squash 'fix typo' commits only". > >>> > >>> Romain Manni-Bucau > >>> @rmannibucau <https://twitter.com/rmannibucau> | Blog > >>> <https://rmannibucau.metawerx.net/> | Old Blog > >>> <http://rmannibucau.wordpress.com> | Github < > >>> https://github.com/rmannibucau> | > >>> LinkedIn <https://www.linkedin.com/in/rmannibucau> | Book > >>> < > >>> > >> > https://www.packtpub.com/application-development/java-ee-8-high-performance > >>> > >>> Le ven. 30 nov. 2018 à 15:50, Richard Monson-Haefel < > >>> [email protected]> > >>> a écrit : > >>> > >>>> Hi, > >>>> > >>>> What does "Squashing your PR" mean? > >>>> > >>>> Thank you! > >>>> > >>>> Richard > >>>> > >>>> On Thu, Nov 29, 2018 at 5:00 PM exabrial12 <[email protected]> > wrote: > >>>> > >>>>> Also, if you don't mind Squashing your PR before submitting the > >>> request, > >>>>> that > >>>>> will help port anything to other branches! > >>>>> > >>>>> > >>>>> > >>>>> -- > >>>>> Sent from: > >>>>> http://tomee-openejb.979440.n4.nabble.com/TomEE-Dev-f982480.html > >>>>> > >>>> > >>>> -- > >>>> Richard Monson-Haefel > >>>> https://twitter.com/rmonson > >>>> https://www.linkedin.com/in/monsonhaefel/ > >>>> > >> > >> -- > >> Richard Monson-Haefel > >> https://twitter.com/rmonson > >> https://www.linkedin.com/in/monsonhaefel/ > >> > > > -- Atentamente: César Hernández Mendoza.
