Le 14/12/2011 10:47, Michael Meeks a écrit :
git tag -f here # backup tag in case we loose something git reset --hard HEAD~50 git pull -r That winds back 50 commits and then re-pulls; of course if you have any commits of your own, you'll now need to do 'gitk here' and cherry pick them across.
Tried HEAD~50, 70 and even 100, with a subsequent .g pull -r each time, but am still getting same error - oh dear.
Alex _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice