You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by David Smiley <da...@gmail.com> on 2019/10/23 15:38:14 UTC
GitHub UI: only want "squash" merge button
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>
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
RE: GitHub UI: only want "squash" merge button
Posted by Uwe Schindler <uw...@thetaphi.de>.
Hi,
Looks good to me, only the “sqash and merge” option is left there for me. I also see the description line and web link behind the repository name.
Uwe
-----
Uwe Schindler
Achterdiek 19, D-28357 Bremen
https://www.thetaphi.de
eMail: uwe@thetaphi.de
From: Jan Høydahl <ja...@cominvent.com>
Sent: Saturday, October 26, 2019 10:15 PM
To: dev@lucene.apache.org
Subject: Re: GitHub UI: only want "squash" merge button
Merged and resolved!
--
Jan Høydahl, search solution architect
Cominvent AS - www.cominvent.com <http://www.cominvent.com>
26. okt. 2019 kl. 01:27 skrev Jan Høydahl <jan.asf@cominvent.com <ma...@cominvent.com> >:
Let's continue on the PR in https://issues.apache.org/jira/browse/LUCENE-8986
I just added your suggestion to the PR https://github.com/apache/lucene-solr/pull/958
--
Jan Høydahl, search solution architect
Cominvent AS - www.cominvent.com <http://www.cominvent.com/>
25. okt. 2019 kl. 19:09 skrev David Smiley <david.w.smiley@gmail.com <ma...@gmail.com> >:
I've found that it's rather rare that PRs have been carefully crafted such that rebase is appropriate. All commit messages prefixed and subjectively not "too many" commits either. BTW remember this is just for the GitHub UI; at the CLI you can do whatever merge/rebase/squash commits you please.
~ David Smiley
Apache Lucene/Solr Search Developer
http://www.linkedin.com/in/davidwsmiley
On Fri, Oct 25, 2019 at 1:03 PM Michael Sokolov <msokolov@gmail.com <ma...@gmail.com> > wrote:
Looks good except are we sure we do not want rebase?
On Fri, Oct 25, 2019, 5:51 PM David Smiley <david.w.smiley@gmail.com <ma...@gmail.com> > wrote:
Infra informed me this is now self-service via adding a ".asf.yaml" file. I looked a the docs and I see this is also an opportunity to set the GitHub project's description, homepage link, and labels. I propose the following:
# https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
github:
description: "Search technology -- Apache Lucene and Apache Solr"
homepage: https://lucene.apache.org <https://lucene.apache.org/>
label:
- search-engine
- information-retrieval
enabled_merge_buttons:
squash: true
merge: false
rebase: false
Re: GitHub UI: only want "squash" merge button
Posted by Jan Høydahl <ja...@cominvent.com>.
Merged and resolved!
--
Jan Høydahl, search solution architect
Cominvent AS - www.cominvent.com
> 26. okt. 2019 kl. 01:27 skrev Jan Høydahl <ja...@cominvent.com>:
>
> Let's continue on the PR in https://issues.apache.org/jira/browse/LUCENE-8986 <https://issues.apache.org/jira/browse/LUCENE-8986>
> I just added your suggestion to the PR https://github.com/apache/lucene-solr/pull/958 <https://github.com/apache/lucene-solr/pull/958>
>
> --
> Jan Høydahl, search solution architect
> Cominvent AS - www.cominvent.com <http://www.cominvent.com/>
>
>> 25. okt. 2019 kl. 19:09 skrev David Smiley <david.w.smiley@gmail.com <ma...@gmail.com>>:
>>
>> I've found that it's rather rare that PRs have been carefully crafted such that rebase is appropriate. All commit messages prefixed and subjectively not "too many" commits either. BTW remember this is just for the GitHub UI; at the CLI you can do whatever merge/rebase/squash commits you please.
>>
>> ~ David Smiley
>> Apache Lucene/Solr Search Developer
>> http://www.linkedin.com/in/davidwsmiley <http://www.linkedin.com/in/davidwsmiley>
>>
>> On Fri, Oct 25, 2019 at 1:03 PM Michael Sokolov <msokolov@gmail.com <ma...@gmail.com>> wrote:
>> Looks good except are we sure we do not want rebase?
>>
>> On Fri, Oct 25, 2019, 5:51 PM David Smiley <david.w.smiley@gmail.com <ma...@gmail.com>> wrote:
>> Infra informed me this is now self-service via adding a ".asf.yaml" file. I looked a the docs and I see this is also an opportunity to set the GitHub project's description, homepage link, and labels. I propose the following:
>>
>> # https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories <https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories>
>>
>> github:
>>
>> description: "Search technology -- Apache Lucene and Apache Solr"
>> homepage: https://lucene.apache.org <https://lucene.apache.org/>
>> label:
>> - search-engine
>> - information-retrieval
>>
>> enabled_merge_buttons:
>> squash: true
>> merge: false
>> rebase: false
>
Re: GitHub UI: only want "squash" merge button
Posted by Jan Høydahl <ja...@cominvent.com>.
Let's continue on the PR in https://issues.apache.org/jira/browse/LUCENE-8986
I just added your suggestion to the PR https://github.com/apache/lucene-solr/pull/958
--
Jan Høydahl, search solution architect
Cominvent AS - www.cominvent.com
> 25. okt. 2019 kl. 19:09 skrev David Smiley <da...@gmail.com>:
>
> I've found that it's rather rare that PRs have been carefully crafted such that rebase is appropriate. All commit messages prefixed and subjectively not "too many" commits either. BTW remember this is just for the GitHub UI; at the CLI you can do whatever merge/rebase/squash commits you please.
>
> ~ David Smiley
> Apache Lucene/Solr Search Developer
> http://www.linkedin.com/in/davidwsmiley <http://www.linkedin.com/in/davidwsmiley>
>
> On Fri, Oct 25, 2019 at 1:03 PM Michael Sokolov <msokolov@gmail.com <ma...@gmail.com>> wrote:
> Looks good except are we sure we do not want rebase?
>
> On Fri, Oct 25, 2019, 5:51 PM David Smiley <david.w.smiley@gmail.com <ma...@gmail.com>> wrote:
> Infra informed me this is now self-service via adding a ".asf.yaml" file. I looked a the docs and I see this is also an opportunity to set the GitHub project's description, homepage link, and labels. I propose the following:
>
> # https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories <https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories>
>
> github:
>
> description: "Search technology -- Apache Lucene and Apache Solr"
> homepage: https://lucene.apache.org <https://lucene.apache.org/>
> label:
> - search-engine
> - information-retrieval
>
> enabled_merge_buttons:
> squash: true
> merge: false
> rebase: false
Re: GitHub UI: only want "squash" merge button
Posted by David Smiley <da...@gmail.com>.
I've found that it's rather rare that PRs have been carefully crafted such
that rebase is appropriate. All commit messages prefixed and subjectively
not "too many" commits either. BTW remember this is just for the GitHub
UI; at the CLI you can do whatever merge/rebase/squash commits you please.
~ David Smiley
Apache Lucene/Solr Search Developer
http://www.linkedin.com/in/davidwsmiley
On Fri, Oct 25, 2019 at 1:03 PM Michael Sokolov <ms...@gmail.com> wrote:
> Looks good except are we sure we do not want rebase?
>
> On Fri, Oct 25, 2019, 5:51 PM David Smiley <da...@gmail.com>
> wrote:
>
>> Infra informed me this is now self-service via adding a ".asf.yaml"
>> file. I looked a the docs and I see this is also an opportunity to set the
>> GitHub project's description, homepage link, and labels. I propose the
>> following:
>>
>> # https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
>>
>> github:
>>
>> description: "Search technology -- Apache Lucene and Apache Solr"
>> homepage: https://lucene.apache.org
>> label:
>> - search-engine
>> - information-retrieval
>>
>> enabled_merge_buttons:
>> squash: true
>> merge: false
>> rebase: false
>>
>>
Re: GitHub UI: only want "squash" merge button
Posted by Michael Sokolov <ms...@gmail.com>.
Looks good except are we sure we do not want rebase?
On Fri, Oct 25, 2019, 5:51 PM David Smiley <da...@gmail.com> wrote:
> Infra informed me this is now self-service via adding a ".asf.yaml" file.
> I looked a the docs and I see this is also an opportunity to set the GitHub
> project's description, homepage link, and labels. I propose the following:
>
> # https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
>
> github:
>
> description: "Search technology -- Apache Lucene and Apache Solr"
> homepage: https://lucene.apache.org
> label:
> - search-engine
> - information-retrieval
>
> enabled_merge_buttons:
> squash: true
> merge: false
> rebase: false
>
>
Re: GitHub UI: only want "squash" merge button
Posted by David Smiley <da...@gmail.com>.
Infra informed me this is now self-service via adding a ".asf.yaml" file.
I looked a the docs and I see this is also an opportunity to set the GitHub
project's description, homepage link, and labels. I propose the following:
# https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
github:
description: "Search technology -- Apache Lucene and Apache Solr"
homepage: https://lucene.apache.org
label:
- search-engine
- information-retrieval
enabled_merge_buttons:
squash: true
merge: false
rebase: false
Re: GitHub UI: only want "squash" merge button
Posted by Noble Paul <no...@gmail.com>.
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 <jp...@gmail.com> wrote:
>
> Ah, I had missed that! Thanks.
>
> On Wed, Oct 23, 2019 at 11:34 PM David Smiley <da...@gmail.com> 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 <jp...@gmail.com> 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 <da...@gmail.com> 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: dev-unsubscribe@lucene.apache.org
> >> For additional commands, e-mail: dev-help@lucene.apache.org
> >>
>
>
> --
> Adrien
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
--
-----------------------------------------------------
Noble Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: GitHub UI: only want "squash" merge button
Posted by Adrien Grand <jp...@gmail.com>.
Ah, I had missed that! Thanks.
On Wed, Oct 23, 2019 at 11:34 PM David Smiley <da...@gmail.com> 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 <jp...@gmail.com> 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 <da...@gmail.com> 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: dev-unsubscribe@lucene.apache.org
>> For additional commands, e-mail: dev-help@lucene.apache.org
>>
--
Adrien
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: GitHub UI: only want "squash" merge button
Posted by David Smiley <da...@gmail.com>.
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 <jp...@gmail.com> 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 <da...@gmail.com>
> 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: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
>
Re: GitHub UI: only want "squash" merge button
Posted by Adrien Grand <jp...@gmail.com>.
+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 <da...@gmail.com> 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: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: GitHub UI: only want "squash" merge button
Posted by Atri Sharma <at...@apache.org>.
+1
On Wed, 23 Oct 2019 at 21:08, David Smiley <da...@gmail.com> 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>
> 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
>
--
Regards,
Atri
Apache Concerted