<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <p>This is what I got:</p>
    <p><br>
    </p>
    <p>$ git remote show origin<br>
      * remote origin<br>
        Fetch URL: git://git.yoctoproject.org/poky<br>
        Push  URL: git://git.yoctoproject.org/poky<br>
        HEAD branch: master</p>
    <p>latest commit:</p>
    <p>bca260ef4dca87c11fc9d30b2b8a17664dc2d879 ninja: Upgrade from
      1.7.2 to major release 1.8.2<br>
      385944254d0ef88bd6450a221a54cbcb40020b42 tcmode-default.inc: drop
      preferred version of gzip-native<br>
    </p>
    <p><br>
    </p>
    <br>
    <div class="moz-cite-prefix">On 02/02/2018 12:58 PM, Burton, Ross
      wrote:<br>
    </div>
    <blockquote type="cite"
cite="mid:CAJTo0LbLxeJEGu=sTpg0uXWNRue7FcFuHMc+qbb1zzDe2QH_cQ@mail.gmail.com">
      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
      <div dir="ltr">On 2 February 2018 at 19:06, Alejandro Enedino
        Hernandez Samaniego <span dir="ltr">&lt;<a
            href="mailto:alejandr@xilinx.com" target="_blank"
            moz-do-not-send="true">alejandr@xilinx.com</a>&gt;</span>
        wrote:<br>
        <div class="gmail_extra">
          <div class="gmail_quote">
            <blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">This
              makes no sense to me, I rebased to master just before
              sending it.<br>
            </blockquote>
            <div><br>
            </div>
            <div>Are you sure that the master you're rebasing is the
              actual upstream master?</div>
            <div><br>
            </div>
            <div>Applying: ninja: Upgrade from 1.7.2 to major release
              1.8.2</div>
            <div>Using index info to reconstruct a base tree...</div>
            <div>error: patch failed: meta/recipes-devtools/ninja/<a
                href="http://ninja_1.7.2.bb:1" moz-do-not-send="true">ninja_1.7.2.bb:1</a></div>
            <div>error: meta/recipes-devtools/ninja/<a
                href="http://ninja_1.7.2.bb" moz-do-not-send="true">ninja_1.7.2.bb</a>:
              patch does not apply</div>
            <div>error: Did you hand edit your patch?</div>
            <div>It does not apply to blobs recorded in its index.</div>
            <div>Patch failed at 0001 ninja: Upgrade from 1.7.2 to major
              release 1.8.2</div>
            <div><br>
            </div>
            <div> </div>
          </div>
        </div>
      </div>
    </blockquote>
    <br>
  </body>
</html>