another issue I noticed was the merge tool in the github UI. When you use that tool to resolve conflicts, it does a merge commit. that results in sending the commit messages to all JIRA issues.
Either we should disable that online merge option or there should be an option to do a squash merge On Thu, Oct 24, 2019 at 9:03 AM Adrien Grand <[email protected]> wrote: > > Ah, I had missed that! Thanks. > > On Wed, Oct 23, 2019 at 11:34 PM David Smiley <[email protected]> > wrote: > > > > These INFRA tickets have a "Project" field. I filled it out based on the > > picklist -- "Lucene". > > > > ~ David Smiley > > Apache Lucene/Solr Search Developer > > http://www.linkedin.com/in/davidwsmiley > > > > > > On Wed, Oct 23, 2019 at 5:32 PM Adrien Grand <[email protected]> wrote: > >> > >> +1 > >> > >> David, I think we need to explicit about the fact that we are asking > >> this for the lucene-solr repo on the INFRA ticket? > >> > >> On Wed, Oct 23, 2019 at 5:38 PM David Smiley <[email protected]> > >> wrote: > >> > > >> > Recent a committer accidentally clicked the merge button on a PR > >> > *without* choosing the type of merge to be squash. Really anyone could > >> > easily make this mistake; it's so easy. The default is the first listed > >> > which is a regular merge commit. Consequently, our Git History is... > >> > well you can see it for yourself :-( > >> > > >> > I filed this with infra so that it doesn't happen again: > >> > INFRA-19333 - Github: only want "Allow squash merging" > >> > https://issues.apache.org/jira/browse/INFRA-19333 > >> > > >> > If only Git had a way to undo accidental pushes to a shared repo that > >> > doesn't cause distributed-pain. Sigh. > >> > > >> > ~ David Smiley > >> > Apache Lucene/Solr Search Developer > >> > http://www.linkedin.com/in/davidwsmiley > >> > >> > >> > >> -- > >> Adrien > >> > >> --------------------------------------------------------------------- > >> To unsubscribe, e-mail: [email protected] > >> For additional commands, e-mail: [email protected] > >> > > > -- > Adrien > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > -- ----------------------------------------------------- Noble Paul --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
