Displaying 1 result from an estimated 1 matches for "687841777ef505".
2018 Sep 06
3
Did anything weird happen to the git monorepo?
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.ll...