1.1 KiB
Raw output - addr-unpacking rebase resolution
The human delegated resolution of the first conflict while rebasing wkt/addr_unpacking from d9a6e2e9 onto 85a44588.
Generated code
git diff HEAD~1..HEAD -- tractor/discovery/_addr.py tractor/discovery/_multiaddr.py tractor/discovery/_tunnel.py
Combined the rebased base’s platform-aware address registries and lazy optional-dependency imports with the replayed TunnelledAddress typing and WireGuard multiaddr dispatch. Adapted the new tunnel module so importing tractor does not eagerly load multiaddr.
git diff HEAD~1..HEAD -- uv.lock
Regenerated the lockfile to retain the replayed WG-capable py-multiaddr revision and direct py-multibase dependency after the new base’s independently changed lockfile silently omitted that hunk.
Verification
Conflict-marker, syntax, lock consistency, lint, collection, focused discovery, and cold-import checks were selected for the resolution.