<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">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">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>