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

On Wed, Jul 27, 2011 at 03:53:18PM +0200, Thomas Arnhold <thomas@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.

Attachment: pgp0_08li_XVu.pgp
Description: PGP signature

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.