Hi
I "fixed" it as follows:
- git checkout master
- remove everything except for the debian/ folder
- git add .
- git commit
- get the upstream tarball and unpack it
- git add .
- git commit
BR
--
Danai
On Mon, 08 Jul 2013 01:20:04 +0800, Danai SAE-HAN (韓達耐) wrote:
> So do you think the best way forward is to redo the Git repository
> completely, and get rid of the intertwined trees altogether?
I'm quite sure that this can be fixed, I just don't know how.
So I'd suggest to wait a bit until one of our git gurus comes around
and takes a look at the issue.
Cheers,
gregor
--
.''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
: :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/
`. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
`- NP: Bruce Springsteen & The E Street Band: Dancing In The Dark