HI, I have updated (locally) patches for the new release of ncbi-blast+. However I face an error during import of new sources in git:
gbp import-orig --pristine-tar ../ncbi-blast+_2.5.0.orig.tar.gz .... Upstream version is 2.5.0 Merging to 'master' Automatic merge failed Error detected, will roll back changes ...... This is the first time I face this. How can I "force" the import of the sources? Or do you know why/how it can occurs? Thanks Olivier