rafaelpierre edited a comment on pull request #11185:
URL: https://github.com/apache/airflow/pull/11185#issuecomment-703284115


   @turbaszek much appreciated, thanks! I'm not that familiar with rebase :) 
one thing I'm struggling with is that I have already rebased, however it still 
shows that these files are conflicting:
   
   breeze-complete
   scripts/ci/libraries/_initialization.sh
   scripts/docker/install_mysql.sh
   
   however, if you look into the first file in the [branch I 
created](https://github.com/rafaelpierre/airflow/blob/legacy-ui-deprecated-rule/breeze-complete),
 it doesn't have any conflict (line 138 looks the same as from v1-10-test)


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

For queries about this service, please contact Infrastructure at:
[email protected]


Reply via email to