search

tahoe-lafs / magic-folder

Tahoe-LAFS-based file synchronization
Other
25 stars 7 forks source link

725.conflict resolution #752

Open meejah opened 7 months ago

meejah commented 7 months ago

Fixes #725

API, CLI and documentation for performing conflict resolution.

meejah commented 4 months ago

@crwood can you write your desired "event" behavior as a ticket, please?

Other than that I think this is mergeable?

crwood commented 4 months ago

@crwood can you write your desired "event" behavior as a ticket, please?

Other than that I think this is mergeable?

Sorry for the late-ish reply here -- but yes, I've set aside some time today to finish my testing against this branch (and will file a ticket for the "event" suggestion alongside it).