dstandish commented on PR #49564: URL: https://github.com/apache/airflow/pull/49564#issuecomment-2821908383
> git diff --check When I'm resolving conflicts i go to pycharm and do "find in files" and search for `<<<<<<` and then just resolve them manually. terminal is for cavemen. -- 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]
