Skip to content
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.

Sign up for GitHub

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

Jump to bottom

third invitee sees conflicts #713

Closed
meejah opened this issue Apr 18, 2023 · 1 comment · Fixed by #712
Closed

third invitee sees conflicts #713

meejah opened this issue Apr 18, 2023 · 1 comment · Fixed by #712
Labels
bug Something isn't working

Comments

@meejah
Copy link
Collaborator

meejah commented Apr 18, 2023

It seems that a third user to be invited to a folder marks existing files as conflicted.
@meejah meejah added the bug Something isn't working label Apr 18, 2023
@meejah
Copy link
Collaborator Author

meejah commented Apr 19, 2023

The bug is a little different: if a client sees an update and then while updating, sees another update for the same Snapshot it incorrectly thinks this is a conflict (basically, the "ancestor" check doesn't include "self").

@meejah meejah mentioned this issue Apr 22, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

identical updates caused conflicts meejah/magic-folder
1 participant
@meejah