You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@quickstep.apache.org by Hakan Memisoglu <ha...@apache.org> on 2016/09/23 20:49:18 UTC
Accidental Push to Master
I accidentally pushed my changes to master directly, then I revert the
changes with forced push. In original ASF repo, everything seems
alright. In Github, the changes have not been reflected yet.
Again sorry for the inconvenience.
Re: Accidental Push to Master
Posted by Hakan Memisoglu <me...@wisc.edu>.
Thanks Julian. I will definitely follow this workflow.
On 09/28/2016 07:00 PM, Julian Hyde wrote:
> Yes, ASF Git is not Github. But the master branch is \u201cprotected\u201d, in the sense that if you do a force-push, it will send an email to the commits list noting that it was a force push. (At least, the Calcite git repo works this way. I think this is standard behavior. I might be mistaken.)
>
> Here\u2019s a tip I find useful: I store the username and password of my GitHub fork, but I don\u2019t store the username and password of the Apache remote. When I push to Apache (force or otherwise), git prompts me for username and password, and that makes me think twice before pressing return.
>
> Julian
>
>
>
>
>> On Sep 28, 2016, at 1:36 PM, J Patel <jm...@gmail.com> wrote:
>>
>> I don't think so :-( ASF, I think, is plain old Git.
>>
>> On Friday, September 23, 2016, Navneet Potti <na...@gmail.com> wrote:
>>
>>> Github has a new feature called protected branches <
>>> https://help.github.com/articles/about-protected-branches/> that
>>> automatically requires a PR acceptance before code can be merged into a
>>> branch. Is there a similar functionality for ASF repo?
>>>
>>>
>>>
>>>> On Sep 23, 2016, at 15:49, Hakan Memisoglu <hakanmemisoglu@apache.org
>>> <javascript:;>> wrote:
>>>> I accidentally pushed my changes to master directly, then I revert the
>>> changes with forced push. In original ASF repo, everything seems alright.
>>> In Github, the changes have not been reflected yet.
>>>> Again sorry for the inconvenience.
>>>>
>>>
Re: Accidental Push to Master
Posted by Julian Hyde <jh...@apache.org>.
Yes, ASF Git is not Github. But the master branch is “protected”, in the sense that if you do a force-push, it will send an email to the commits list noting that it was a force push. (At least, the Calcite git repo works this way. I think this is standard behavior. I might be mistaken.)
Here’s a tip I find useful: I store the username and password of my GitHub fork, but I don’t store the username and password of the Apache remote. When I push to Apache (force or otherwise), git prompts me for username and password, and that makes me think twice before pressing return.
Julian
> On Sep 28, 2016, at 1:36 PM, J Patel <jm...@gmail.com> wrote:
>
> I don't think so :-( ASF, I think, is plain old Git.
>
> On Friday, September 23, 2016, Navneet Potti <na...@gmail.com> wrote:
>
>> Github has a new feature called protected branches <
>> https://help.github.com/articles/about-protected-branches/> that
>> automatically requires a PR acceptance before code can be merged into a
>> branch. Is there a similar functionality for ASF repo?
>>
>>
>>
>>> On Sep 23, 2016, at 15:49, Hakan Memisoglu <hakanmemisoglu@apache.org
>> <javascript:;>> wrote:
>>>
>>> I accidentally pushed my changes to master directly, then I revert the
>> changes with forced push. In original ASF repo, everything seems alright.
>> In Github, the changes have not been reflected yet.
>>>
>>> Again sorry for the inconvenience.
>>>
>>
>>
Re: Accidental Push to Master
Posted by J Patel <jm...@gmail.com>.
I don't think so :-( ASF, I think, is plain old Git.
On Friday, September 23, 2016, Navneet Potti <na...@gmail.com> wrote:
> Github has a new feature called protected branches <
> https://help.github.com/articles/about-protected-branches/> that
> automatically requires a PR acceptance before code can be merged into a
> branch. Is there a similar functionality for ASF repo?
>
>
>
> > On Sep 23, 2016, at 15:49, Hakan Memisoglu <hakanmemisoglu@apache.org
> <javascript:;>> wrote:
> >
> > I accidentally pushed my changes to master directly, then I revert the
> changes with forced push. In original ASF repo, everything seems alright.
> In Github, the changes have not been reflected yet.
> >
> > Again sorry for the inconvenience.
> >
>
>
Re: Accidental Push to Master
Posted by Navneet Potti <na...@gmail.com>.
Github has a new feature called protected branches <https://help.github.com/articles/about-protected-branches/> that automatically requires a PR acceptance before code can be merged into a branch. Is there a similar functionality for ASF repo?
> On Sep 23, 2016, at 15:49, Hakan Memisoglu <ha...@apache.org> wrote:
>
> I accidentally pushed my changes to master directly, then I revert the changes with forced push. In original ASF repo, everything seems alright. In Github, the changes have not been reflected yet.
>
> Again sorry for the inconvenience.
>