kaxil commented on PR #43909:
URL: https://github.com/apache/airflow/pull/43909#issuecomment-2509731479

   > Greetings, I was away for the holidays. Thank you all for review!
   > 
   > @kaxil Thank you for resolving the conflict. Can you please tell me what 
it was?
   
   Hi @geraj1010 , I hope you had a good holiday. Your base branch was 1000 
commits behind the Airflow main -- Example: 
https://github.com/apache/airflow/commits/39ebd75c5cb066218a2b6b3940eddc217dd816d9/docs/sphinx_design/static/custom.css
 -- your branch's base commit was from December 2023 -- so rebased on the main 
branch.
   
   <img width="718" alt="image" 
src="https://github.com/user-attachments/assets/dccf8aef-d95b-4c93-aa43-6aed31160571";>
   


-- 
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-unsubscr...@airflow.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

Reply via email to