2017-06-27 13:14 GMT+02:00 James Cowgill <[email protected]>: > Hi, > > On 27/06/17 12:11, Jaromír Mikeš wrote: > > 2017-06-27 12:06 GMT+02:00 Fabian Greffrath <[email protected] > > <mailto:[email protected]>>: > > > > 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 :( > > This might work: > > Ensure everything is stashed / committed > Delete all the files in your working directory > Run: > $ git checkout upstream -- . > $ git checkout -- debian/ .gitignore > > Commit the result
Still not work :( Thank you James mira
_______________________________________________ pkg-multimedia-maintainers mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
