[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lucene-dev
Subject:    Re: Do we actually merge the GitHub pull requests?
From:       Cassandra Targett <casstargett () gmail ! com>
Date:       2020-08-28 19:10:44
Message-ID: 2908f95c-c119-4275-a54d-b265bf5c94e7 () Spark
[Download RAW message or body]

If you don't see an option to squash merge in a few hours, I'd suggest talking to \
Infra team - they're on the asf-slack at #infra.

Cassandra
On Aug 28, 2020, 1:56 PM -0500, Alexandre Rafalovitch <arafalov@gmail.com>, wrote:
> I did some linking before, but not the gitbox that I remember. Did it
> now and it says, I have access to:
> * lucene-site
> * lucene-solr
> 
> So hopefully but the time I am ready to merge, I can. If not, I'll be back here.
> 
> Thank you,
> Alex.
> 
> On Fri, 28 Aug 2020 at 14:15, Cassandra Targett <casstargett@gmail.com> wrote:
> > 
> > You do have to link your GitHub and Apache identities. You need to have 2FA \
> > enabled on your GH account. 
> > Add your GH ID to your ASF LDAP profile at id.apache.org. It can take a couple \
> > hours for you to be added to the Apache org in GitHub. 
> > I think that's all it takes, but you can go here to check the status and what \
> > repos you have access to: https://gitbox.apache.org/setup/ (or, I might have it \
> > backwards, and you have to request it no matter what. Either way, if it doesn't \
> > work by adding to your LDAP profile, you can use the gitbox link to request it to \
> > be done). 
> > Cassandra
> > On Aug 28, 2020, 12:48 PM -0500, Uwe Schindler <uwe@thetaphi.de>, wrote:
> > 
> > You need to squash merge, real merging is not allowed on GitHub.
> > 
> > With git client it works of course, but we want external pull request not pollute \
> > our history. 
> > Uwe
> > 
> > Am August 28, 2020 5:45:27 PM UTC schrieb Alexandre Rafalovitch \
> > <arafalov@gmail.com>:
> > > 
> > > I am working on finalizing
> > > https://github.com/apache/lucene-solr/pull/1794 (DIH removal) and when
> > > I looked at it (before conflicts), it did not allow me to merge.
> > > 
> > > It said instead:
> > > "Only those with write access to this repository can merge pull requests."
> > > 
> > > Did I have to do some extra linking of my personal and apache
> > > identities? I am already an apache org member and I am pretty sure
> > > (not 100%) that I pushed directly into GitHub repo before. But now
> > > when I am doing it via PR, it seems different.
> > > 
> > > Can anybody else merge and I can't? Or we just don't do merges?
> > > 
> > > Regards,
> > > Alex.
> > > 
> > > ________________________________
> > > 
> > > To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> > > For additional commands, e-mail: dev-help@lucene.apache.org
> > > 
> > 
> > --
> > Uwe Schindler
> > Achterdiek 19, 28357 Bremen
> > https://www.thetaphi.de


[Attachment #3 (text/html)]

<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title></title>
</head>
<body>
<div name="messageBodySection">
<div dir="auto">If you don't see an option to squash merge in a few hours, I'd \
suggest talking to Infra team - they're on the asf-slack at #infra.</div> </div>
<div name="messageSignatureSection"><br />
<div class="matchFont">Cassandra</div>
</div>
<div name="messageReplySection">On Aug 28, 2020, 1:56 PM -0500, Alexandre Rafalovitch \
&lt;arafalov@gmail.com&gt;, wrote:<br /> <blockquote type="cite" \
style="border-left-color: grey; border-left-width: thin; border-left-style: solid; \
margin: 5px 5px;padding-left: 10px;">I did some linking before, but not the gitbox \
that I remember. Did it<br /> now and it says, I have access to:<br />
* lucene-site<br />
* lucene-solr<br />
<br />
So hopefully but the time I am ready to merge, I can. If not, I'll be back here.<br \
/> <br />
Thank you,<br />
Alex.<br />
<br />
On Fri, 28 Aug 2020 at 14:15, Cassandra Targett &lt;casstargett@gmail.com&gt; \
wrote:<br /> <blockquote type="cite"><br />
You do have to link your GitHub and Apache identities. You need to have 2FA enabled \
on your GH account.<br /> <br />
Add your GH ID to your ASF LDAP profile at id.apache.org. It can take a couple hours \
for you to be added to the Apache org in GitHub.<br /> <br />
I think that's all it takes, but you can go here to check the status and what repos \
you have access to: https://gitbox.apache.org/setup/ (or, I might have it backwards, \
and you have to request it no matter what. Either way, if it doesn't work by adding \
to your LDAP profile, you can use the gitbox link to request it to be done).<br /> \
<br /> Cassandra<br />
On Aug 28, 2020, 12:48 PM -0500, Uwe Schindler &lt;uwe@thetaphi.de&gt;, wrote:<br />
<br />
You need to squash merge, real merging is not allowed on GitHub.<br />
<br />
With git client it works of course, but we want external pull request not pollute our \
history.<br /> <br />
Uwe<br />
<br />
Am August 28, 2020 5:45:27 PM UTC schrieb Alexandre Rafalovitch \
&lt;arafalov@gmail.com&gt;:<br /> <blockquote type="cite"><br />
I am working on finalizing<br />
https://github.com/apache/lucene-solr/pull/1794 (DIH removal) and when<br />
I looked at it (before conflicts), it did not allow me to merge.<br />
<br />
It said instead:<br />
"Only those with write access to this repository can merge pull requests."<br />
<br />
Did I have to do some extra linking of my personal and apache<br />
identities? I am already an apache org member and I am pretty sure<br />
(not 100%) that I pushed directly into GitHub repo before. But now<br />
when I am doing it via PR, it seems different.<br />
<br />
Can anybody else merge and I can't? Or we just don't do merges?<br />
<br />
Regards,<br />
Alex.<br />
<br />
________________________________<br />
<br />
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org<br />
For additional commands, e-mail: dev-help@lucene.apache.org<br />
<br /></blockquote>
<br />
--<br />
Uwe Schindler<br />
Achterdiek 19, 28357 Bremen<br />
https://www.thetaphi.de<br /></blockquote>
</blockquote>
</div>
</body>
</html>



[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic