potiuk commented on PR #35508: URL: https://github.com/apache/airflow/pull/35508#issuecomment-1799356648
> Really nice, this is something that I frequently encountered, and got used to just not solve conflicts add everything and rerun the command manually to get the latest image and hash update. Right now those will also just run autoamtically when pre-commit is run (improved it last week). Actually it was not a big issue until several people started to work on parallel on those breeze commands - or added things like new providers, changing versions of k8s, adding new static checks, adding new commands that indirectly influence the commands (by updating list of packages or list of versions of software or list of new providers etc. etc. Note that it will not solve all conflicts - if two people will add providers in-parallel, the second one to merge will still get conflict - but it will be a good one, it really means that you **should** regenerate the screenshots (and it will happen automatically once you resolve the conflict and commit it. But there should be far less conflicts where adding new K8s version for example will clash with new static check added because those will modify differnet command files. -- 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
