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

Thomas Arnhold <thomas -AT- arnhold.org>
Fri, 29 Jul 2011 13:49:14 +0200

On 07/29/2011 01:45 PM, Bjoern Michaelsen wrote:

On Fri, 29 Jul 2011 13:37:20 +0200
Miklos Vajna<vmiklos@frugalware.org>  wrote:

15:47<@Sweetshark>  shm_get: I just killed the hooks dir with maximum
prejudice.


Yes, because the changes from master that I merged into the branch
didnt conform to the tests in githooks (I assume the hooks got stricter
since the time of the commits). :(

No they didn't get stricter! The problem only occurs if you have a mergeconflict and you use 'git add' and 'git rebase --continue'. See myearlier mail.


Thomas

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
        
        Re: [Libreoffice] About merging and people not paying attention · Robert Nagy
- Re: [Libreoffice] About merging and people not paying attention · Norbert Thiebaud

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.