Makes sense, I didn't think about automatic synchronization. I agree
that we should not force push to master (we have discussed renaming to
"main"), so using revert commits when there is a mistake sounds fine,
too.
On Sat, Jul 24, 2021 at 12:09 PM Jarek Potiuk wrote:
>
> Also one comment for
Also one comment for force-pushes to the main branch - I did it twice
before (before we enabled protection) and It turned out that it broke some
of our users whole setup automated synchronization of 'airflow' repo (they
added automated patching of they patches on top of our repo and
force-pushed
Hey Wes, others.
It also protects you if you merge/push with git commands.
I stopped worrying and double-checking if I have the "right" remote when I
push directly to master when we enabled the protection because I simply
can't push directly to master of "apache/airflow" any more (unless I am
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
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 wrote:
> Thanks. I went ahead and did that.
>
> On Fri, Jul 23, 2021 at 6:53
Thanks. I went ahead and did that.
On Fri, Jul 23, 2021 at 6:53 PM Mauricio Vargas
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 wrote:
>
> > Well it did not take long for me to make a mistake. I
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 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
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
