Hello Andreas, On Wed, Feb 01, 2017 at 01:36:41PM +0100, Andreas Tille wrote: > My question is: Is there any obvious workaround I'm just missing? I > was checking out the upstream branch, removed .gitattributes, copied > all files from tarball and commited these, restored .gitattributes and > merged the changes into the master branch. > > I could imagine simply removing .gitattributes from the upstream tarball > (OK, I could ask upstream to do so for sure) but changing the upstream > tarball just for doing this does not seem to be the best idea either. > > Both methods are somehow leading to a working repository - but is there > any better way for this? You could run `dgit setup-gitattributes`. It will disable upstream's .gitattributes, which might be enough. -- Sean Whitton
Attachment:
signature.asc
Description: PGP signature