On Wed, Jul 27, 2011 at 03:53:18PM +0200, Thomas Arnhold <tho...@arnhold.org> wrote: > I think this was not intended. Simple solution would be to add some > '<<<<<<< HEAD' .* '=======' .* '>>>>>>> master' stuff to git hooks. So > git would block commits with conflicts.
Good idea - care to send a patch? The pre-commit hook is at git-hooks/pre-commit in bootstrap.git. Thanks.
pgpA5zqNAxJe7.pgp
Description: PGP signature
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
