Skip to content

conflict resolution file format proposal #22

@vm-wylbur

Description

@vm-wylbur

When there are sync conflicts, the user will have to choose one file from local, synced, or remote. This is the version of the file that will be retained, the others will be overwritten. In the case of sxLCR__C_ne_R, the user can choose delete. Thoughts?

=== BB/import/input/lots-of-docs.tar.xz ===
CHOOSE: [ ] local  [ ] synced  [ ] remote
LOCAL   alice  01Jun-15:15:31  15.2KB
SYNCED  bob    28May-09:15:22  14.8KB
REMOTE  carol  01Jun-16:45:18  16.1KB
[sLCR__all_ne: all three copies differ]

=== BB/analyze/task1/output/results.parquet ===
CHOOSE: [ ] synced  [ ] remote  [ ] delete
SYNCED  alice  30May-12:00:33   1.9KB
REMOTE  bob    01Jun-17:00:12   2.3KB
[sxLCR__C_ne_R: local missing; remote and cache differ]

=== BB/config/input/database.json ===
CHOOSE: [ ] local  [ ] remote
LOCAL   alice  01Jun-15:00:45   2.1KB
REMOTE  bob    01Jun-14:30:22   2.0KB
[sLxCR__L_ne_R: cache missing; local and remote differ]

=== BB/analyze/task2/output/processing-data.csv ===
CHOOSE: [ ] local  [ ] synced
LOCAL   alice  01Jun-18:22:15   5.7KB
SYNCED  alice  01Jun-16:45:33   5.2KB
[sLCxR__L_ne_C: remote missing; local and cache differ]

Metadata

Metadata

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions