empty directory in the 1.1.1 series release tags

[Benjamin Kaduk]

On Tue, Apr 21, 2020 at 10:08:39AM -0700, Quanah Gibson-Mount wrote:
> The OpenSSL release tags contain an empty directory "krb5" that does not
> exist in the release tarball.  This is annoying because when I go to merge
> release tags, I constantly get the following:
> 
> CONFLICT (modify/delete): krb5 deleted in HEAD and modified in
> OpenSSL_1_1_1e. Version OpenSSL_1_1_1e of krb5 left in tree.
> 
> Can this please be fixed?

The 'krb5' entry in git is a submodule, used for the external tests.
It's removed while preparing release tarballs, but I'm not sure what
you are doing that's causing conflicts -- are you doing something that
involves both tarballs and git?

-Ben