Ilia Sotnikov <hostcc at gmail.com> wrote: Hi,
> ** Updating scanners lists > From git://git.debian.org/sane/sane-backends > 764aa7c..e232f54 master -> origin/master > Updating 354b9a5..e232f54 > backend/.gitignore: needs update > frontend/.gitignore: needs update > include/sane/.gitignore: needs update > tools/.gitignore: needs update > error: Entry 'backend/.gitignore' not uptodate. Cannot merge. > error: hooks/post-receive exited with error code 128 Hmm fixed by checking out the problematic files and pulling manually. Don't know what happened, we'll see if it reoccurs. JB. -- Julien BLACHE <http://www.jblache.org> <jb at jblache.org> GPG KeyID 0xF5D65169
