Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


On 07/29/2011 01:37 PM, Miklos Vajna wrote:
On Fri, Jul 29, 2011 at 11:46:21AM +0200, Thomas Arnhold<thomas@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


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.