potiuk commented on pull request #20701: URL: https://github.com/apache/airflow/pull/20701#issuecomment-1008600954
I think something wen't "really wrong" so in this case I recommend to restart the branch from the latest main and copy the changes manully @edithturn. Your changes are really isolated, so you should not have troubles with picking them one by one and applying to main. Sometimes it happens to me as well when I do some bad merges. I just did that to make it easier for you and this is what I did this time to restore to the "before merge state" 1) I looked at the latest commit from the historty that was "good" - that was the 'fixup' commit I pushed * `git checkout 0eaebfe7fa8b7dbd9259e6f89aad474a35685514` ( I saw that in PR history) 2) Found the "base" commit where you started from: 97261c642cbf07db91d252cf6b0b7ff184cd64c6 - this was the original commit that your changes were based on. 3) Squashed all your (and mine) changes together: `git rebase -i 97261c642cbf07db91d252cf6b0b7ff184cd64c6` - :2,$s/pickup/fixup/ 4) This resulted in a separate commit a3cd3517a2eb326d12e5de54f5c5b632bfd5ba66 ( you will not find it - it was a temporary only) 5) I moved the "check-free-space-branch` to current apache/main `git checkout main` `git pull` 'git branch -f check-free-space-branch` 6) I cherry-picked the temporary commit: `git cherry-pick a3cd3517a2eb326d12e5de54f5c5b632bfd5ba66` 7) Pushed the branch to your PR `git push --force` -- 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]
