On Wed, Apr 28, 2010 at 11:38, Harry Rickards <ha...@linux.com> wrote: > On 28 April 2010 16:30, <hrickards-gu...@users.alioth.debian.org> wrote: >> The following commit has been merged in the master branch: >> commit a00c0019ef859d52834bfd75f61046c5a7583650 >> Merge: 7b52094914795b119554c72005f8a71b5b7ff559 >> 521457f7eb1ad6056bd9fa6e68d9062a8214acb4 >> Author: Harry <hricka...@l33tmyst.com> >> Date: Wed Apr 28 16:29:55 2010 +0100 >> >> Merge branch 'master' of git://git.debian.org/git/pkg-multimedia/lives >> > Damn. I had a directory with some changes not in git in, and added a > new upstream author to debian/copyright. When pushing I got a > non-fast-foward-error, and I though 'git pull'ing and pushing again > would fix this. What should I do now? Out of the 4 commits this merge > has made, only the debian/copyright is needed. Sorry everyone!
Just revert the changes that are not necessary (git revert <commit>). -- Saludos, Felipe Sateler _______________________________________________ pkg-multimedia-maintainers mailing list firstname.lastname@example.org http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers