On 07/29/2011 01:45 PM, Bjoern Michaelsen wrote:
On Fri, 29 Jul 2011 13:37:20 +0200
Miklos Vajna<[email protected]> 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 merge
conflict and you use 'git add' and 'git rebase --continue'. See my
earlier mail.
Thomas
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
