On 12/01/2016 02:37 PM, olivier sallou wrote: > 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? There is an option --merge-mode=[merge|replace] but is it safe to use replace ? There is no info on merge issues. > > Thanks > > Olivier
-- Olivier Sallou IRISA / University of Rennes 1 Campus de Beaulieu, 35000 RENNES - FRANCE Tel: 02.99.84.71.95 gpg key id: 4096R/326D8438 (keyring.debian.org) Key fingerprint = 5FB4 6F83 D3B9 5204 6335 D26D 78DC 68DB 326D 8438
