<div dir="ltr">So I&#39;m 99% sure this is Exchange tramping the mail and git not handling that, as the patch is quoted-printable encoded.    I&#39;ll pick from the branch :)<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 2 February 2018 at 21:28, Alejandro Enedino Hernandez Samaniego <span dir="ltr">&lt;<a href="mailto:alejandro.enedino.hernandez-samaniego@xilinx.com" target="_blank">alejandro.enedino.hernandez-samaniego@xilinx.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
  
    
  
  <div text="#000000" bgcolor="#FFFFFF">
    <p>I might be wrong but you can check it here as well:<br>
    </p>
<a class="m_965412715345799169moz-txt-link-freetext" href="https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=aehs29/ninja" target="_blank">https://git.yoctoproject.org/<wbr>cgit/cgit.cgi/poky-contrib/<wbr>log/?h=aehs29/ninja</a><div><div class="h5"><br>
    <br>
    <br>
    <div class="m_965412715345799169moz-cite-prefix">On 02/02/2018 01:22 PM, Alejandro
      Enedino Hernandez Samaniego wrote:<br>
    </div>
    <blockquote type="cite">
      
      <p>This is what I got:</p>
      <p><br>
      </p>
      <p>$ git remote show origin<br>
        * remote origin<br>
          Fetch URL: git://<a href="http://git.yoctoproject.org/poky" target="_blank">git.yoctoproject.org/<wbr>poky</a><br>
          Push  URL: git://<a href="http://git.yoctoproject.org/poky" target="_blank">git.yoctoproject.org/<wbr>poky</a><br>
          HEAD branch: master</p>
      <p>latest commit:</p>
      <p>bca260ef4dca87c11fc9d30b2b8a17<wbr>664dc2d879 ninja: Upgrade from
        1.7.2 to major release 1.8.2<br>
        385944254d0ef88bd6450a221a54cb<wbr>cb40020b42 tcmode-default.inc:
        drop preferred version of gzip-native<br>
      </p>
      <p><br>
      </p>
      <br>
      <div class="m_965412715345799169moz-cite-prefix">On 02/02/2018 12:58 PM, Burton, Ross
        wrote:<br>
      </div>
      <blockquote type="cite">
        <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">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&#39;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" target="_blank">ni<wbr>nja_1.7.2.bb:1</a></div>
              <div>error: meta/recipes-devtools/ninja/<a href="http://ninja_1.7.2.bb" target="_blank">ni<wbr>nja_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>
    </blockquote>
    <br>
  </div></div></div>

</blockquote></div><br></div>