vsoch commented on issue #7191: [AIRFLOW-4030] second attempt to add singularity to airflow URL: https://github.com/apache/airflow/pull/7191#issuecomment-586638274 I can try to address the conflicts, but I can't rebase it seems: ``` Auto-merging setup.py CONFLICT (content): Merge conflict in setup.py Auto-merging scripts/ci/in_container/entrypoint_ci.sh Auto-merging docs/operators-and-hooks-ref.rst Auto-merging Dockerfile error: could not apply bacc3b54c... adding singularity operator and tests Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply bacc3b54c... adding singularity operator and tests ```
---------------------------------------------------------------- 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
