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:
Did someone push -f to the monorepo after doing branch surgery?
Maybe there was a PSA somewhere that I missed?
Here’s official master:
Here’s master on my fork:
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.
Normally I’d say I just held git wrong, but the commit hashes of my copy also exist on the official llvm-project master.
If nobody else sees weirdness it’s probably all good.
I also got a forced update just now, but I use split repos.
I think someone force pushed in order to remove a commit "[libFuzzer] Port to Windows" and it's reversion?
I still see those revisions in my local clone, FWIW…