[Libreoffice] About merging and people not paying attention

[Miklos Vajna]

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