RosterIn commented on issue #4846: [AIRFLOW-4030] adding start to singularity for airflow URL: https://github.com/apache/airflow/pull/4846#issuecomment-571147206 @vsoch The conflicts are of fields which I'm not sure why you edited? You added many spaces to: ``` airflow/executors/__init__.py airflow/macros/__init__.py tests/contrib/hooks/test_cassandra_hook.py airflow/executors/__init__.py airflow/macros/__init__.py ``` how is that relevant to this PR? Your PR should add changes only to: ``` airflow/contrib/example_dags/example_singularity_operator.py airflow/contrib/operators/singularity_operator.py setup.py tests/contrib/operators/test_singularity_operator.py ``` 3 of this files are new so they can't cause conflicts. 1 is just edit one line for the install Rebasing here should be easy once you remove irrelevant files changes. You will need to fix only 1 conflict in `setup.py` (which is 1 row)
---------------------------------------------------------------- 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] With regards, Apache Git Services
