shahar1 commented on PR #53589: URL: https://github.com/apache/airflow/pull/53589#issuecomment-3121704079
> I have resolved conflicts and fixed SSL verification logic in PR #53589 but my new commits are on detached HEAD and not part of my feature branch. The branch has diverged from remote so push attempts fail as stale. Even after cloning outside AIRFLOW_HOME and trying rebase steps I can’t attach my commits cleanly or push without risking data loss or duplication. Pre-commit and CI fail mainly because repo is checked out inside AIRFLOW_HOME. How do I connect my commits to the branch fix push errors and set up repo to pass CI? I am not worried about Docker errors. I am ready to follow steps and share more info. From my experience, if commits history gets messy - try to create a patch from the existing branch (it will only mark the changes), then create another branch from `main`, apply the patch there, commit and create a new PR. I found this guide on [Google](https://www.specbee.com/blogs/how-create-and-apply-patch-git-diff-and-git-apply-commands-our-drupal-website), I hope that it could be helpful. -- 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]
