[Debian-med-packaging] Trouble importing libzstd latest upstream release

[Andreas Tille]

Hi Kevin,

On Thu, Jun 30, 2016 at 08:42:44PM +1000, Kevin Murray wrote:
> Forgive me if there's something simple I've missed, but I'm having trouble
> importing the latest upstream release of zstd[1].
> 
> Using ``gbp import-orig --uscan`` I am able to detect the upstream version and
> download the orig.tar.gz correctly. But the import fails with merge conflicts.
> Is this expected occasionally? I shouldn't have changed any upstream files in
> git, so I don't see where the conflicts should come from (it should just be as
> though I branched, made all the changes in one commit and am now fast-forward
> merging, right?).

I have not checked zstd but this morning I updated vsearch and onserved
also merge conflicts.  I simply copied over the files from the source
tarball and commited this.  Anybody else with this experience?

Kind regards

      Andreas.

-- 
http://fam-tille.de