uranusjr commented on pull request #18930: URL: https://github.com/apache/airflow/pull/18930#issuecomment-953515482
I think this is rebased to the wrong base. Not sure what the best way to recover is; personally I usually `cherry-pick` the commits manually back: ``` # Assumes 'origin' points to apache/airflow -- adjust 'origin' as needed. git fetch origin main git branch -f main origin/main # Point the local 'main' to the origin's main. git checkout main git cherry-pick e700a59ae85beb7bbfbd25153b4d9eeb3c78a9d8 # Manully apply the commit's changes again. git push --force ``` To avoid this from happening again, it is best to *avoid making changes on your own 'main' directly*, but instead *create a branch for each pull request*. Since this PR is already submitted, it is not possible to change the originating branch now, but this is a good approach to remember if you plan to make other pull requests in the future. -- 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]
