import-orig failed

[Jaromír Mikeš]

2016-11-10 18:32 GMT+01:00 James Cowgill <jcowgill at debian.org>:
> On 10/11/16 12:53, Jaromír Mikeš wrote:
>>
>> while updating hydrogen package import-orig failed ...
>>
>> Any help?
>
> If you do 'gbp import-orig --no-rollback' gbp will leave the repo in a
> state where you can investigate the failed merge. After doing that, it
> looks like there's a merge conflict on the .gitignore file.

good point ;)

mira