> > 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 wh
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
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 hav
3 matches
Mail list logo