shreyaskj-0710 commented on PR #54341:
URL: https://github.com/apache/airflow/pull/54341#issuecomment-3243829458

   > Nice! This PR is good to go after resolving the conflict, thanks! The 
alembic related conflict can be resolved with [airflow/contributing-docs 
/14_metadata_database_updates - How to Resolve Conflicts When Rebasing 
](https://github.com/apache/airflow/blob/main/contributing-docs/14_metadata_database_updates.rst#how-to-resolve-conflicts-when-rebasing).
   > 
   > <img alt="conflict" width="940" height="469" 
src="https://private-user-images.githubusercontent.com/68415893/484187924-073e55ce-af73-4ab5-899c-150da65bf885.png?jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3NTY3OTExODEsIm5iZiI6MTc1Njc5MDg4MSwicGF0aCI6Ii82ODQxNTg5My80ODQxODc5MjQtMDczZTU1Y2UtYWY3My00YWI1LTg5OWMtMTUwZGE2NWJmODg1LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTA5MDIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwOTAyVDA1MjgwMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWQ5ZmI0ZTY4ZGJkMzY5MjFkZDdkNThlYzVmMWRkNGExZDc1OGJkY2JjNDg2MjFjMGU1ZThiNjY0OTUzNjUzYWYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.MRPpKrgpXYa9UlT2jL83GtAe3Yrm-rqIrdmvv0f8vRc";>
   
   Hi @jason810496 ,
   have resolved the conflicts and updated the PR.


-- 
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]

Reply via email to