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


Thanks. I pushed the first one, but the second one did not apply,
severa patch hunks failed. Could you please check that?

Probably your source code is out of sync and you need to do a git
pull. You might run into merge conflicts when you do that because of
slight changes needed to your patch(es) when they were committed by me
(because files had changed slightly in some context lines since you
had started editing them), so it might be best to first save your
unpushed work, and then git reset --hard origin (hmm, I hope I
remember that right), then git pull -r.

--tml

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.