On Fri, Jul 29, 2011 at 4:01 AM, Miklos Vajna <vmik...@frugalware.org> wrote: > 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.
NOOO please. let's not pile up every random tests one can think of in the commit hook... This can only lead to problems both in perf and in 'git is randomly screwing up' complaint and after a while in a generalized abuse of git commit -n The pre-commit hook just really test stuff that are commonly screwed-up yet hard to detect. The corner case of a missed merge-conflict is a 1 in 100000 occurrence at least, and it is extremely unlikely to go undetected for long. Norbert _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
