Repository navigation
Commit 992da38
committed
Record main@aa1e5c06 as merged into v4 (ancestry only, no content change)
PR #3298 brought main's 19 commits to 2026-10-23 into v4 but was squash-merged (da8181e), so
git lost the merge parent and still counted those commits as unmerged. A trial three-way merge of
aa1e5c0 onto v4 reproduces v4's tree exactly, apart from re-adding BatchWriteFailureTests and
ConnectionFailureExceptionTests, which #3298 dropped on purpose (they drove v3 internals;
ConnectionDroppedExceptionTests covers both from the public surface). This commit takes v4's tree
and adds aa1e5c0 as a parent so future merges of main start from where they should.0 file changed
0 commit comments