git-import-orig error

[Jaromír Mikeš]

Hi all,

just trying get new upstream release to git and having this error here:
--------------
$ git-import-orig /home/mira/zynjacku_5.2.orig.tar.gz 
Upstream version is 5.2
Importing '/home/mira/zynjacku_5.2.orig.tar.gz' to branch 'upstream'...
Switched to branch 'upstream'
rm 'lv2rack.py'
rm 'zynjacku.py'
rm 'zynspect.py'
[upstream 220833c] Imported Upstream version 5.2
 8 files changed, 178 insertions(+), 491 deletions(-)
 copy lv2rack.py => lv2rack (97%)
 rename lv2rack.py => zynjacku (54%)
 rename zynspect.py => zynspect (100%)
 rename zynjacku.py => zynworld/host.py (88%)
 mode change 100755 => 100644
Merging to 'master'
Switched to branch 'master'
Renaming lv2rack.py->zynjacku
Auto-merging zynjacku
Renaming zynjacku.py->zynworld/host.py
Auto-merging zynworld/host.py
CONFLICT (content): merge conflict in zynworld/host.py
Auto-merging configure
CONFLICT (content): Merge conflict in configure
Auto-merging configure.ac
CONFLICT (content): Merge conflict in configure.ac
Automatic merge failed; fix conflicts and then commit the result.
git returned 1
Couldn't merge from "upstream/5.2"
Traceback (most recent call last):
  File "/usr/bin/git-import-orig", line 408, in <module>
    sys.exit(main(sys.argv))
  File "/usr/bin/git-import-orig", line 380, in main
    raise GbpError, """Merge failed, please resolve.""" % version
TypeError: not all arguments converted during string formatting
------
how to solve such issue ?

regards

mira