Thanks Andrey,
I've found my error. Downloaded zip from upstream git repo, it has a
.gitignore file which should be removed because already there's
another under collab-maint repo.
Best regards.
Elias Alejandro
On Mon, Oct 17, 2016 at 01:28:56PM -0300, Elías Alejandro wrote:
> gbp:debug: ['git', 'merge', '--no-summary', '--no-edit',
> 'upstream/0.2.5_git20161017']
> gbp:error: Automatic merge failed.
If your new upstream cannot be merged into master this either means there
is a debian/ in the upstream bra
Dear all,
I want to package an upstream snapshot from a git repository, however
I get errors importing with
Basically first I download the directory from upstream git repository,
and renamed to package~git20161017 and then compress it as
package~git20161017.orig.tar.gz
I take this new tarball to us
3 matches
Mail list logo
