Skip to content

Conflict with two-way-resolved #533

@aiven-anton

Description

@aiven-anton

My case is similar to #271 but I'm opting to post a new issue as that one is closed. I'm seeing a conflict happen on a sync configured with two-way-resolved. The full long output is pasted below with some file names redacted. If the context is of any help, the synchronized directory is a codebase managed with git, and git operations mainly happen on the host.

Identifier: sync_vjGboElCDnHVa7dnPsCquhbS33zOtUyQzabFb8X5jD2
Configuration:
	Synchronization mode: Two Way Resolved
	Hashing algorithm: Default (SHA-1)
	Maximum allowed entry count: Default (2⁶⁴−1)
	Maximum staging file size: Default (18 EB)
	Symbolic link mode: Default (Portable)
	Ignore syntax: Default (Mutagen)
	Ignores:
		.DS_Store
		._*
		.idea
		.mypy-caches
		.ruff_cache
		.pytest_cache
		.hypothesis
		.pids
		node_modules
		__pycache__
		*.tar
		*.rpm
		.dev.env
		.systest.env
	Ignore VCS mode: Default (Propagate)
	Permissions mode: Default (Portable)
Alpha:
	URL: /Users/anton/some-dir
	Configuration:
		Watch mode: Default (Portable)
		Watch polling interval: Default (10 seconds)
		Probe mode: Default (Probe)
		Scan mode: Default (Accelerated)
		Stage mode: Default (Mutagen Data Directory)
		File mode: 0644
		Directory mode: 0755
		Default file/directory owner: Default
		Default file/directory group: Default
	Connected: Yes
	Synchronizable contents:
		7874 directories
		75567 files (2.8 GB)
		141 symbolic links
Beta:
	URL: anton.agestam@avn-dev-07:/home/anton.agestam.linux/some-dir
	Configuration:
		Watch mode: Default (Portable)
		Watch polling interval: Default (10 seconds)
		Probe mode: Default (Probe)
		Scan mode: Default (Accelerated)
		Stage mode: Default (Mutagen Data Directory)
		File mode: 0644
		Directory mode: 0755
		Default file/directory owner: Default
		Default file/directory group: Default
		Compression: Default (DEFLATE)
	Connected: Yes
	Synchronizable contents:
		7875 directories
		75570 files (2.8 GB)
		141 symbolic links
Conflicts:
	(alpha) path/to/conflict (Directory -> <non-existent>)
	(beta)  path/to/conflict/__pycache__ (<non-existent> -> Untracked content)
Status: Watching for changes

Metadata

Metadata

Assignees

No one assigned

    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