Merging OpenSSL_1_1_1o to rhel-8 creates conflict about locally deleted pyca-cryptography
This seems to be deleted in the rhel-8 branch. I plan to do git rm pyca-cryptography and continue.
Here is the output
[openssl]$ git checkout rhel-8
Branch 'rhel-8' set up to track remote branch 'rhel-8' from 'origin'.
Switched to a new branch 'rhel-8'
[openssl]$ git merge OpenSSL_1_1_1o
CONFLICT (modify/delete): pyca-cryptography deleted in HEAD and modified in OpenSSL_1_1_1o. Version OpenSSL_1_1_1o of pyca-cryptography left in tree.
Automatic merge failed; fix conflicts and then commit the result.
Edited by Ondřej Kuzník