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 2021/07/08 08:56:01 UTC
[GitHub] [airflow] ashb opened a new pull request #16882: Enable "Rebase and merge" button on PRs.
ashb opened a new pull request #16882:
URL: https://github.com/apache/airflow/pull/16882
The default will still be Squash and Merge, but there are some times (mostly when working on release branches, but a few other cases have cropped up) where we want to accept a PR but keep the commits.
Rather than making committers need to use the CLI and having to know that you can approve a PR on GitHub (but don't merge it there) and then manually push, lets just let people do it in GitHub directly.
See https://github.com/apache/airflow/pull/16878 for an example of where we wouldn't want that as a squashed commit
<!--
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/main/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/main/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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb merged pull request #16882: Enable "Rebase and merge" button on PRs.
Posted by GitBox <gi...@apache.org>.
ashb merged pull request #16882:
URL: https://github.com/apache/airflow/pull/16882
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] github-actions[bot] commented on pull request #16882: Enable "Rebase and merge" button on PRs.
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #16882:
URL: https://github.com/apache/airflow/pull/16882#issuecomment-876290109
The PR is likely ready to be merged. No tests are needed as no important environment files, nor python files were modified by it. However, committers might decide that full test matrix is needed and add the 'full tests needed' label. Then you should rebase it to the latest main or amend the last commit of the PR, and push it with --force-with-lease.
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on pull request #16882: Enable "Rebase and merge" button on PRs.
Posted by GitBox <gi...@apache.org>.
ashb commented on pull request #16882:
URL: https://github.com/apache/airflow/pull/16882#issuecomment-876261715
I tested these settings (if not the .asf.yaml) on my repo, and the default is Squash and Rebase still.
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on pull request #16882: Enable "Rebase and merge" button on PRs.
Posted by GitBox <gi...@apache.org>.
kaxil commented on pull request #16882:
URL: https://github.com/apache/airflow/pull/16882#issuecomment-876353341
Good call
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org