Skip to content

Enable conflict detection in sneakernet transfers - #71

Open
MrKeiKun wants to merge 1 commit into
S4tvara:mainfrom
MrKeiKun:fix-46-conflict-detection
Open

Enable conflict detection in sneakernet transfers#71
MrKeiKun wants to merge 1 commit into
S4tvara:mainfrom
MrKeiKun:fix-46-conflict-detection

Conversation

@MrKeiKun

@MrKeiKun MrKeiKun commented Oct 3, 2025

Copy link
Copy Markdown
Contributor

Description
Sneakernet conflict detection was failing because ContentHash was never populated in FileManifest structures. This caused all conflict comparisons to return false, preventing detection of files with the same path but different content.

Referenced Issue: #46

@MrKeiKun
MrKeiKun force-pushed the fix-46-conflict-detection branch from 2935ddc to bdbe4c4 Compare October 4, 2025 05:52
@S4tvara

S4tvara commented Oct 6, 2025

Copy link
Copy Markdown
Owner

Hi @MrKeiKun,
I was able to replicate the responses.

Please update the conflicts, and I'll merge the PR.

@MrKeiKun
MrKeiKun force-pushed the fix-46-conflict-detection branch from bdbe4c4 to 2dcfe63 Compare October 13, 2025 11:54
@github-actions

Copy link
Copy Markdown
Contributor

💡 Suggestions to Improve This PR

  • ❌ Missing or minimal explanation of changes

Consider addressing these points to make your contribution stronger. Thanks for contributing!

@MrKeiKun
MrKeiKun force-pushed the fix-46-conflict-detection branch from 2dcfe63 to 1f7bbed Compare October 13, 2025 11:55
@github-actions

Copy link
Copy Markdown
Contributor

💡 Suggestions to Improve This PR

  • ❌ Missing or minimal explanation of changes

Consider addressing these points to make your contribution stronger. Thanks for contributing!

@MrKeiKun
MrKeiKun force-pushed the fix-46-conflict-detection branch from 1f7bbed to c1f8eea Compare October 13, 2025 11:57
@github-actions

Copy link
Copy Markdown
Contributor

💡 Suggestions to Improve This PR

  • ❌ Missing or minimal explanation of changes

Consider addressing these points to make your contribution stronger. Thanks for contributing!

@MrKeiKun

Copy link
Copy Markdown
Contributor Author

@SubstantialCattle5

rabased and updated.

@S4tvara

S4tvara commented Oct 13, 2025

Copy link
Copy Markdown
Owner

Cool, I'll review it later

💡 Suggestions to Improve This PR

  • ❌ Missing or minimal explanation of changes

Consider addressing these points to make your contribution stronger. Thanks for contributing!

you're getting this error because your pr doesn't follow the new template, disregard it for now.

@codecov

codecov Bot commented Oct 13, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 24 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
cmd/add.go 0.00% 24 Missing ⚠️

📢 Thoughts on this report? Let us know!

…FileManifest

Signed-off-by: Lorenzo Buitizon <the.keikun@gmail.com>
@MrKeiKun
MrKeiKun force-pushed the fix-46-conflict-detection branch from c1f8eea to e854c81 Compare October 15, 2025 10:36
@github-actions

Copy link
Copy Markdown
Contributor

💡 Suggestions to Improve This PR

  • ❌ Missing or minimal explanation of changes

Consider addressing these points to make your contribution stronger. Thanks for contributing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants