mik-laj edited a comment on pull request #16110: URL: https://github.com/apache/airflow/pull/16110#issuecomment-943219956
@casra-developers Before making a rebase, it is worthwhile to merge all the changes. ``` git rebase -i HEAD^^^^^^^^^^^ ``` And then you need to replace all the `pick` commands with `fixup` commands except the first one. You will have to use `git push --force` when pushing the change. If you have a new branch that you want to put in this PR then you can just overwrite all commits in that PR. You don't have to create new PR. ```shell git checkout old-branch git reset --hard new-branch git push --force ``` Here are tips from our [pull request guideline](https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst#pull-request-guidelines): > When merging PRs, Committer will use Squash and Merge which means then your PR will be merged as one commit, regardless of the number of commits in your PR. During the review cycle, you can keep a commit history for easier review, but if you need to, you can also squash all commits to reduce the maintenance burden during rebase. Are these tips helpful to you? -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
