Hi, On 27/06/17 13:33, Jaromír Mikeš wrote: > 2017-06-27 14:18 GMT+02:00 James Cowgill <[email protected] > <mailto:[email protected]>>: > > Hi, > > On 27/06/17 13:12, Jaromír Mikeš wrote: > > 2017-06-27 13:14 GMT+02:00 James Cowgill <[email protected] > <mailto:[email protected]> > > <mailto:[email protected] <mailto:[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]> > <mailto:[email protected] <mailto:[email protected]>> > > > <mailto:[email protected] <mailto:[email protected]> > <mailto:[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 :( > > What happens when you run the above? It seems to work OK for me > (dpkg-buildpackage -S works). > > > $ git checkout upstream -- > Switched to branch 'upstream' > Your branch is up-to-date with 'origin/upstream'.
You missed the dot. Switch back to the master branch, then type what's inbetween the quotes: "git checkout upstream -- ." James
signature.asc
Description: OpenPGP digital signature
_______________________________________________ pkg-multimedia-maintainers mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
