You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2020/11/17 11:54:59 UTC
[GitHub] [airflow] kaxil opened a new pull request #12394: Allow rebase merging PRs
kaxil opened a new pull request #12394:
URL: https://github.com/apache/airflow/pull/12394
Since we have added v1-10-stable to Protected branches we need to enable rebase merging too so that we can regularly sync v1-10-stable and v1-10-test
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on pull request #12394: Allow rebase merging PRs
Posted by GitBox <gi...@apache.org>.
kaxil commented on pull request #12394:
URL: https://github.com/apache/airflow/pull/12394#issuecomment-728899672
> I think the plan was that we'd approve the big PR, then do the merge on git cli, and push that way. Right @potiuk?
We won't be able to push it to v1-10-stable anymore since it is a protected branch
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on pull request #12394: Allow rebase merging PRs
Posted by GitBox <gi...@apache.org>.
kaxil commented on pull request #12394:
URL: https://github.com/apache/airflow/pull/12394#issuecomment-728902914
> > > I think the plan was that we'd approve the big PR, then do the merge on git cli, and push that way. Right @potiuk?
> >
> >
> > We won't be able to push it to v1-10-stable anymore since it is a protected branch
>
> I thought we could if the commit matches the one from a PR.
I haven't tried that, let me make convert this PR as draft for now, will try that later and see if that works
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] potiuk commented on pull request #12394: Allow rebase merging PRs
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #12394:
URL: https://github.com/apache/airflow/pull/12394#issuecomment-728909217
No need as discussed :) . Just fast-forward push will do the trick
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil edited a comment on pull request #12394: Allow rebase merging PRs
Posted by GitBox <gi...@apache.org>.
kaxil edited a comment on pull request #12394:
URL: https://github.com/apache/airflow/pull/12394#issuecomment-728899672
> I think the plan was that we'd approve the big PR, then do the merge on git cli, and push that way. Right @potiuk?
We won't be able to push commits directlyly to v1-10-stable anymore since it is a protected branch
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on pull request #12394: Allow rebase merging PRs
Posted by GitBox <gi...@apache.org>.
ashb commented on pull request #12394:
URL: https://github.com/apache/airflow/pull/12394#issuecomment-728897001
I think the plan was that we'd approve the big PR, then do the merge on git cli, and push that way. Right @potiuk?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] potiuk closed pull request #12394: Allow rebase merging PRs
Posted by GitBox <gi...@apache.org>.
potiuk closed pull request #12394:
URL: https://github.com/apache/airflow/pull/12394
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on pull request #12394: Allow rebase merging PRs
Posted by GitBox <gi...@apache.org>.
ashb commented on pull request #12394:
URL: https://github.com/apache/airflow/pull/12394#issuecomment-728899973
> > I think the plan was that we'd approve the big PR, then do the merge on git cli, and push that way. Right @potiuk?
>
> We won't be able to push it to v1-10-stable anymore since it is a protected branch
I thought we could if the commit matches the one from a PR.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org