{"action":"created","issue":{"url":"https://api.github.com/repos/syncthing/syncthing/issues/1848","labels_url":"https://api.github.com/repos/syncthing/syncthing/issues/1848/labels{/name}","comments_url":"https://api.github.com/repos/syncthing/syncthing/issues/1848/comments","events_url":"https://api.github.com/repos/syncthing/syncthing/issues/1848/events","html_url":"https://github.com/syncthing/syncthing/issues/1848","id":79090361,"number":1848,"title":"Conflict resolution outcome should be based on mtime and only then on id","user":{"login":"AudriusButkevicius","id":1144861,"avatar_url":"https://avatars.githubusercontent.com/u/1144861?v=3","gravatar_id":"","url":"https://api.github.com/users/AudriusButkevicius","html_url":"https://github.com/AudriusButkevicius","followers_url":"https://api.github.com/users/AudriusButkevicius/followers","following_url":"https://api.github.com/users/AudriusButkevicius/following{/other_user}","gists_url":"https://api.github.com/users/AudriusButkevicius/gists{/gist_id}","starred_url":"https://api.github.com/users/AudriusButkevicius/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AudriusButkevicius/subscriptions","organizations_url":"https://api.github.com/users/AudriusButkevicius/orgs","repos_url":"https://api.github.com/users/AudriusButkevicius/repos","events_url":"https://api.github.com/users/AudriusButkevicius/events{/privacy}","received_events_url":"https://api.github.com/users/AudriusButkevicius/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/syncthing/syncthing/labels/enhancement","name":"enhancement","color":"009800"}],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":4,"created_at":"2015-05-21T17:28:15Z","updated_at":"2015-05-22T15:36:25Z","closed_at":null,"body":"To make it more likely that the right file wins I guess?\r\nAny problems with this?"},"comment":{"url":"https://api.github.com/repos/syncthing/syncthing/issues/comments/104693429","html_url":"https://github.com/syncthing/syncthing/issues/1848#issuecomment-104693429","issue_url":"https://api.github.com/repos/syncthing/syncthing/issues/1848","id":104693429,"user":{"login":"AudriusButkevicius","id":1144861,"avatar_url":"https://avatars.githubusercontent.com/u/1144861?v=3","gravatar_id":"","url":"https://api.github.com/users/AudriusButkevicius","html_url":"https://github.com/AudriusButkevicius","followers_url":"https://api.github.com/users/AudriusButkevicius/followers","following_url":"https://api.github.com/users/AudriusButkevicius/following{/other_user}","gists_url":"https://api.github.com/users/AudriusButkevicius/gists{/gist_id}","starred_url":"https://api.github.com/users/AudriusButkevicius/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AudriusButkevicius/subscriptions","organizations_url":"https://api.github.com/users/AudriusButkevicius/orgs","repos_url":"https://api.github.com/users/AudriusButkevicius/repos","events_url":"https://api.github.com/users/AudriusButkevicius/events{/privacy}","received_events_url":"https://api.github.com/users/AudriusButkevicius/received_events","type":"User","site_admin":false},"created_at":"2015-05-22T15:36:25Z","updated_at":"2015-05-22T15:36:25Z","body":"Well vector clocks allow detecting the conflict, as in - two clocks moved concurrently, but the fact that two clocks ticked by 1 version does not imply that either of them is newer, it just implies that both of them changed.\r\n\r\nThe decision on which one is the original and which one is the conflict is based on the first 64 bits of device ID (so that the whole cluster has a consensus on which file wins).\r\nBut this could also be based on mtime of the file two files in conflict, and then based on the device ID given the mtimes are exactly the same."}}