search

rualark / MGen

MGen: Windows PC C++ music generation and analysis laboratory, playing into MIDI port and exporting MIDI
http://arkhipenko.weebly.com
GNU Affero General Public License v3.0
45 stars 11 forks source link

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

Open rualark opened 4 years ago

rualark commented 4 years ago

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))