Bug#475571: Faced the same issue as reported in #475571

2008-09-07 Thread Guido Günther
On Sat, Sep 06, 2008 at 11:43:01PM +0400, Nikita V. Youshchenko wrote: I tried to import one of my packages, namely libetpan, into a git repo, and faced the exact situation described in #475571. After importing released package versions, new orig.tar.gz failed to merge because git attempted

Bug#475571: Faced the same issue as reported in #475571

2008-09-07 Thread Nikita V. Youshchenko
I tried to import one of my packages, namely libetpan, into a git repo, and faced the exact situation described in #475571. After importing released package versions, new orig.tar.gz failed to merge because git attempted to apply old changes in upsteam branch to debian branch while those

Bug#475571: Faced the same issue as reported in #475571

2008-09-06 Thread Nikita V. Youshchenko
Hi I tried to import one of my packages, namely libetpan, into a git repo, and faced the exact situation described in #475571. After importing released package versions, new orig.tar.gz failed to merge because git attempted to apply old changes in upsteam branch to debian branch while those