-
Notifications
You must be signed in to change notification settings - Fork 26
Enable conflict detection in sneakernet transfers #71
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
2935ddc to
bdbe4c4
Compare
|
Hi @MrKeiKun, Please update the conflicts, and I'll merge the PR. |
bdbe4c4 to
2dcfe63
Compare
💡 Suggestions to Improve This PR
Consider addressing these points to make your contribution stronger. Thanks for contributing! |
2dcfe63 to
1f7bbed
Compare
💡 Suggestions to Improve This PR
Consider addressing these points to make your contribution stronger. Thanks for contributing! |
1f7bbed to
c1f8eea
Compare
💡 Suggestions to Improve This PR
Consider addressing these points to make your contribution stronger. Thanks for contributing! |
|
@SubstantialCattle5 rabased and updated. |
|
Cool, I'll review it later
you're getting this error because your pr doesn't follow the new template, disregard it for now. |
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
…FileManifest Signed-off-by: Lorenzo Buitizon <[email protected]>
c1f8eea to
e854c81
Compare
💡 Suggestions to Improve This PR
Consider addressing these points to make your contribution stronger. Thanks for contributing! |
Description
Sneakernet conflict detection was failing because
ContentHashwas never populated inFileManifeststructures. This caused all conflict comparisons to return false, preventing detection of files with the same path but different content.Referenced Issue: #46