drumkv1 repo - failed merge

[Jaromír Mikeš]

2017-06-27 12:06 GMT+02:00 Fabian Greffrath <fabian at greffrath.com>:

> Jaromír Mikeš wrote:
>

Hi Fabian,


> > Can someone advise me how to fix it pls?
>
> Do you have any patches applied? If yes, unapply them before attempting to
> merge the new upstream release.
>
> If this doesn't help, try calling "git checkout -- " on the files git
> complains about.
>

Tried this now but it didn't help :(

best regards

mira
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20170627/c58d9e5b/attachment.html>