[llvm-dev] Did anything weird happen to the git monorepo?
Nico Weber via llvm-dev
llvm-dev at lists.llvm.org
Thu Sep 6 08:04:52 PDT 2018
Hi,
I got a forced update when pulling today. If I merge master to a local
branch, I get a bunch of add/add conflicts.
This same commit exists under several hashes:
https://github.com/llvm-project/llvm-project-20170507/commit/687841777ef505
https://github.com/llvm-project/llvm-project-20170507/commit/74725885552
Did someone push -f to the monorepo after doing branch surgery?
Maybe there was a PSA somewhere that I missed?
Thanks,
Nico
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20180906/2abfefff/attachment.html>
More information about the llvm-dev
mailing list