Re: [Libreoffice] About merging and people not paying attention

Miklos Vajna <vmiklos -AT- frugalware.org>
Fri, 29 Jul 2011 13:37:20 +0200

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.

Attachment: pgpioj63AOxSb.pgp
Description: PGP signature

Context

[Libreoffice] About merging and people not paying attention · Robert Nagy
- Re: [Libreoffice] About merging and people not paying attention · Thomas Arnhold
  - Re: [Libreoffice] About merging and people not paying attention · Robert Nagy
  - Re: [Libreoffice] About merging and people not paying attention · Miklos Vajna
    - Re: [Libreoffice] About merging and people not paying attention · Thomas Arnhold
      - Re: [Libreoffice] About merging and people not paying attention · Miklos Vajna
        
        Re: [Libreoffice] About merging and people not paying attention · Bjoern Michaelsen
        
        Re: [Libreoffice] About merging and people not paying attention · Thomas Arnhold
        
        Re: [Libreoffice] About merging and people not paying attention · Thomas Arnhold
    - Re: [Libreoffice] About merging and people not paying attention · Norbert Thiebaud
      - Re: [Libreoffice] About merging and people not paying attention · Tor Lillqvist
- Re: [Libreoffice] About merging and people not paying attention · Kohei Yoshida
  - Re: [Libreoffice] About merging and people not paying attention · Robert Nagy
    - Re: [Libreoffice] About merging and people not paying attention · Bjoern Michaelsen
      - Re: [Libreoffice] About merging and people not paying attention · Robert Nagy
      - Re: [Libreoffice] About merging and people not paying attention · Tor Lillqvist

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.