hi Jarek, We don't merge with the GitHub UI, so I am not sure if that will help us.
Weston, in the future if you make a mistake like this and notice right away, IMHO it's acceptable to force-push master reverting the mistake. If some time has lapsed then reverting is better. I have had my git checkouts all set up so that pushing to apache/arrow can't happen unless I explicitly use the apache branch target git push apache $BRANCH Everyone should ensure that the "origin" branch points to your fork rather than apache/arrow. - Wes On Sat, Jul 24, 2021 at 2:32 AM Jarek Potiuk <ja...@potiuk.com> wrote: > > FYI. You can protect branches with .asf.yaml against those kind of > incidents: > https://github.com/apache/airflow/blob/8e94c1c64902b97be146cdcfe8b721fced0a283b/.asf.yaml#L43 > > On Sat, Jul 24, 2021 at 7:04 AM Weston Pace <weston.p...@gmail.com> wrote: > > > Thanks. I went ahead and did that. > > > > On Fri, Jul 23, 2021 at 6:53 PM Mauricio Vargas > > <mavarga...@uc.cl.invalid> wrote: > > > > > > I think that a 2nd commit + push with the reverse shall be the best fix > > > > > > On Sat, Jul 24, 2021 at 12:41 AM Weston Pace <weston.p...@gmail.com> > > wrote: > > > > > > > Well it did not take long for me to make a mistake. I accidentally > > > > pushed a commit to master instead of my remote when creating a PR. > > > > What is the best way to remedy this? Push a revert? Since it is > > > > protected I cannot force push to reset back to where it was (not that > > > > I would necessarily want to do that). > > > > > > > > I have updated my master and removed the upstream (that probably > > > > should never have been there) so hopefully this won't happen again. > > > > > > > > -Weston > > > > > > > > > > > > > -- > > > — > > > *Mauricio 'Pachá' Vargas Sepúlveda* > > > Site: pacha.dev > > > Blog: pacha.dev/blog > > > > > -- > +48 660 796 129
