I see now in 691a82a, Github did the wrong thing. Apparently, because this repo uses squash merge, thereby rewriting history, Git can't tell that the lines removed in 96f14c2 were to be removed, and instead of complaining that there's a conflict, it just undid that change.

I've filed a Github support ticket to report the issue to Github and get their opinion on it. In the meantime, 17f614e should work around the issue.

I've filed a Github support ticket

Looks like probably only you @jaraco can see that ticket.

@jaraco I'm trying to reboot myself on this discussion. @jaraco was the deprecation of access to these ABCs ever documented as deprecated in the library docs? I can't find that. That's not to say that it should hold up removal of these, since the deprecation warnings happened in the code. If we go ahead and remove the b/c hack now, I do think that any documentation update to importlib.resources.abc should explicitly mention the deprecation and removal history of access through importlib.abc.

Looks like probably only you @jaraco can see that ticket.

Yeah, that's true. That's how Github does things. I linked it here to be transparent about what I'm doing and to associate a reference. Still no response, BTW.

was the deprecation of access to these ABCs ever documented as deprecated in the library docs?

I did not previously include that effort as part of this change because Hugo and others were working on docs updates. The deprecations were subsequently documented in #94546.

Hey @jaraco , what are the next steps here?

Just FYI, following what was discussed in python/core-workflow#475 , this is the only personal feature branch remaining on the upstream cpython repo, which blocks the full implementation of the branch protection rule approved in python/steering-council#144 that would avoid the issue where it is easy to push personal feature branches to the upstream by accident, either through the Git CLI or via GitHub's web Edit feature.

Let's close this and delete the branch and hope someone can find the changes when the time comes to submit it.

Re-done as #119720.