<div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr">Here's official master:<div><a href="https://github.com/llvm-project/llvm-project-20170507/commits/master?after=b66bfed5ba898b5e901a216bf229bfee48ebfc46+209">https://github.com/llvm-project/llvm-project-20170507/commits/master?after=b66bfed5ba898b5e901a216bf229bfee48ebfc46+209</a><br></div><div><br></div><div>Here's master on my fork:</div><div><a href="https://github.com/nico/llvm-project-20170507/commits/master?after=612985fa09e93c06c8816270740ab81a2cdfb1de+34">https://github.com/nico/llvm-project-20170507/commits/master?after=612985fa09e93c06c8816270740ab81a2cdfb1de+34</a><br></div><div><br></div><div>Things are identical until "[Sparc] allow tls_add/tls_call syntax in assembler parser". On official master, it's followed by "[OpenCL] Traverse vector types for ocl extensions support" and then "[AArch64] Simplify code in LowerGlobalAddress. NFCI.", while on my fork it's followed by "[AArch64] Simplify code in LowerGlobalAddress. NFCI." immediately.</div><div><br></div><div>Normally I'd say I just held git wrong, but the commit hashes of my copy also exist on the official llvm-project master.</div><div><br></div><div>If nobody else sees weirdness it's probably all good.</div></div></div></div></div></div></div></div><br><div class="gmail_quote"><div dir="ltr">On Thu, Sep 6, 2018 at 11:04 AM Nico Weber <<a href="mailto:thakis@chromium.org">thakis@chromium.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div dir="ltr"><div dir="ltr">Hi,<div><br></div><div>I got a forced update when pulling today. If I merge master to a local branch, I get a bunch of add/add conflicts.</div><div><br>This same commit exists under several hashes:</div><div><a href="https://github.com/llvm-project/llvm-project-20170507/commit/687841777ef505" target="_blank">https://github.com/llvm-project/llvm-project-20170507/commit/687841777ef505</a><br></div><div><a href="https://github.com/llvm-project/llvm-project-20170507/commit/74725885552" target="_blank">https://github.com/llvm-project/llvm-project-20170507/commit/74725885552</a><br></div><div><br></div><div>Did someone push -f to the monorepo after doing branch surgery?</div><div><br></div><div>Maybe there was a PSA somewhere that I missed?</div><div><br></div><div>Thanks,</div><div>Nico</div></div></div></div>
</blockquote></div>