[Libreoffice] About merging and people not paying attention

[Thomas Arnhold]

On 07/29/2011 01:37 PM, Miklos Vajna wrote:
> 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.

Right, this would be the ultimate solution to get over a conflict ;)

But despite this fact it's still possible to merge conflicts with 
git-hooks as I described earlier.

Thomas