On Tue, Apr 21, 2020 at 10:19:28AM -0700, Quanah Gibson-Mount wrote: > --On Tuesday, April 21, 2020 11:16 AM -0700 Benjamin Kaduk > <bka...@akamai.com> wrote: > > > 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? > > I use the git release tags, not the tarballs.
Can't you just leave the empty directory in your local branch and not have a conflict, then? -Ben
