[Libreoffice] About merging and people not paying attention

[Miklos Vajna]

On Fri, Jul 29, 2011 at 11:46:21AM +0200, Thomas Arnhold <thomas at arnhold.org> wrote:
> Yeah, I've already found that file. Strangely we already have such a 
> check: 
> http://cgit.freedesktop.org/libreoffice/bootstrap/tree/git-hooks/pre-commit#n61

Oh, now I remember how such conflicts could be still introduced:

15:47 <@Sweetshark> shm_get: I just killed the hooks dir with maximum prejudice.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20110729/60e7d6a9/attachment.pgp>