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.

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

A conflict happens, while file could not be changed on beta #2683

Open
rualark opened this issue Dec 1, 2019 · 0 comments
Open

A conflict happens, while file could not be changed on beta #2683

rualark opened this issue Dec 1, 2019 · 0 comments

Comments

@rualark
Copy link
Owner

rualark commented Dec 1, 2019

I get a conflict, while file was changed only on alpha. Why can this happen? Are there situations, when changing file on alpha lead to conflict, while there were no changes on beta?

Name: xxx
Identifier: 7af24ac7-3ebe-445b-9b61-ea2a0d1be0d8
Labels: None
Alpha:
        URL: C:\D\xxx
        Connection state: Connected
Beta:
        URL: aark.yyy.net:/home/aark/xxx
        Connection state: Connected
Status: Watching for changes
Conflicts:
        (α) zzz/.idea/workspace.xml (<non-existent> -> File (60ab40863d512aa7bb6d7c9c5710a1cde70366b0))
        (β) zzz/.idea/workspace.xml (<non-existent> -> File (f00be12143e2d95fcd232cc3be62a0fbeccbed37))
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

No branches or pull requests

1 participant