dstandish commented on PR #49564: URL: https://github.com/apache/airflow/pull/49564#issuecomment-2824707990
> Fine for me. Though not affected. PyCharm /IntelliJ has fantastic conflict resolution tooling that handles conflict resolution really nicely. I guess I'm old fashioned and never really liked using GUI tools for conflict resolution -- even though they were around since before I started doing dev work 🤷 -- 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]
