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


On 12/20/2016 02:12 PM, Huzaifa Iftikhar wrote:


On Tue, Dec 20, 2016 at 6:22 PM, Stephan Bergmann <sbergman@redhat.com
<mailto:sbergman@redhat.com>> wrote:

    On 12/20/2016 01:44 PM, Huzaifa Iftikhar wrote:

        Thanks for the reply, I understand the situation.
        Should I wait for Norbert Thiebaud to reply or should I submit
        my patch
        once again ?


    Besides waiting for Norbert to eventually fix the underlying
    problem, you can additionally:

    * Either rebase your Gerrit change (e.g., in the Gerrit web UI,
    press the "Rebase" button),


what does rebase do ? 

it will rebase your commit on the current master branch, which will
possibly remove some build breakers that the old master had, possibly
introduce new build breakers that the old master didn't have, and most
importantly trigger another Jenkins CI build.

so if the Jenkins build failed because of something unrelated to your
change, and you don't have any negative reviews, then it's usually a
good idea to try the "rebase".

    * or prepare a new revision of your change (seeing that it received
    a -2 comment, so probably needs updating), and push that to Gerrit.

Should I submit a new commit or just amend changes and push it to the
existing patch ?

please amend the existing commit and don't modify the "Change-ID" line,
then gerrit will be able to match it properly and update the existing
change.


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.