If the solution is rewriting history, then that sounds way too extreme... we should make sure INFRA does not do this.
Kind regards, Matt From: Carlos Santana <[email protected]> To: [email protected] Date: 09/14/2017 09:27 AM Subject: Re: Git commit I don't want INFRA rewriting the history on master !! We can give creds by reverting and resubmitting When multiple authors are in a PR we need to use the button "rebase and merge" when there is one author use the "squash and merge" which is the default for me, And yes mistakes like this happens I think happened twice to me :-) in the openwhisk-cli repo, and we reverted and resubmitted the PR On Wed, Sep 13, 2017 at 6:02 PM Rodric Rabbah <[email protected]> wrote: > With Matt's help, I created a JIRA issue > https://urldefense.proofpoint.com/v2/url?u=https-3A__issues.apache.org_jira_browse_INFRA-2D15081&d=DwIBaQ&c=jf_iaSHvJObTbx-siA1ZOg&r=6zQLM7Gc0Sv1iwayKOKa4_SFxRIxS478q2gZlAJj4Zw&m=FKhq2p327vjSAVFaS1Vju1O_ncn6NHMZgRLImAK23C4&s=xidhYv7l2f_JHQ1o6I8wK98UgvjEdcTfN6jmfl32oBQ&e= for reference. > > -r > > On Wed, Sep 13, 2017 at 5:02 PM, Rodric Rabbah <[email protected]> wrote: > > > Thanks Matt. > > > > Separately, Carlos suggested reverting the commit and then commit again. > > Absent a better suggestion/option, I'll do that. > > > > On a side note, I will now be more careful using the shinny green button > > which I think some of us have gotten accustomed to recently. > > > > -r > > > > On Wed, Sep 13, 2017 at 5:00 PM, Matt Rutkowski <[email protected]> > > wrote: > > > >> Sounds like a question for INFRA team; however, only a few are working > >> with GitHub and would not be surprised if they do not have a procedure > for > >> this. For Apache purposes, it would be important for "Snoot" tool to > ack. > >> credit for committers when multiple appear on the same merge. > >> > >> > >> > >> > >> From: Rodric Rabbah <[email protected]> > >> To: [email protected] > >> Date: 09/13/2017 03:05 PM > >> Subject: Git commit > >> > >> > >> > >> Hi > >> > >> I just merged a PR: > >> https://urldefense.proofpoint.com/v2/url?u=https-3A__github. > >> com_apache_incubator-2Dopenwhisk_pull_2718&d=DwIFAg&c=jf_ > >> iaSHvJObTbx-siA1ZOg&r=6zQLM7Gc0Sv1iwayKOKa4_SFxRIxS478q2gZlA > >> Jj4Zw&m=IPgHMBExfU1B6EDZtJh9gTpAvgNGZqmYvqNPXwQCEGo&s=wQxKGq > >> 6kmqsqwqpwOm7jVnAPJ5aj4_ZxxtcacxAPBsA&e= > >> > >> > >> You can see if look at it the first commit is it mine but is Scott > >> Wilson-Billing's. > >> > >> Yet when I squashed and merge the PR (which I opened to rebase and > update > >> because we dropped the ball on its predecessor > >> https://urldefense.proofpoint.com/v2/url?u=https-3A__github. > >> com_apache_incubator-2Dopenwhisk_pull_2171&d=DwIFAg&c=jf_ > >> iaSHvJObTbx-siA1ZOg&r=6zQLM7Gc0Sv1iwayKOKa4_SFxRIxS478q2gZlA > >> Jj4Zw&m=IPgHMBExfU1B6EDZtJh9gTpAvgNGZqmYvqNPXwQCEGo&s= > >> WjsheALhQmd-XeZy1hnygJ2IIqbOLDILcQt6rSCiWjo&e= > >> ) I was credited with the commit [1] which is not right. > >> > >> I don't know how to correct this without forcing an updated commit > (which > >> I don't think we have rights to). What's the Apache way of fixing this? > >> > >> -r > >> > >> [1] > >> https://urldefense.proofpoint.com/v2/url?u=https-3A__github. > >> com_apache_incubator-2Dopenwhisk_commit_ec56eb81005a0a62cadd > >> 591ca55e1468c73df2b3&d=DwIFAg&c=jf_iaSHvJObTbx-siA1ZOg&r=6zQ > >> LM7Gc0Sv1iwayKOKa4_SFxRIxS478q2gZlAJj4Zw&m=IPgHMBExfU1B6EDZt > >> Jh9gTpAvgNGZqmYvqNPXwQCEGo&s=-1rdGjaZwu-DQK60KeQFNgn7eWRe8jc > >> sl20UM1u1sKs&e= > >> > >> > >> > >> > >> > > >
