{"action":"created","issue":{"url":"https://api.github.com/repos/syncthing/syncthing/issues/1022","labels_url":"https://api.github.com/repos/syncthing/syncthing/issues/1022/labels{/name}","comments_url":"https://api.github.com/repos/syncthing/syncthing/issues/1022/comments","events_url":"https://api.github.com/repos/syncthing/syncthing/issues/1022/events","html_url":"https://github.com/syncthing/syncthing/issues/1022","id":49952789,"number":1022,"title":"Improve conflict resolution mechanism when merging trees for the first time","user":{"login":"Zillode","id":14169,"avatar_url":"https://avatars.githubusercontent.com/u/14169?v=3","gravatar_id":"","url":"https://api.github.com/users/Zillode","html_url":"https://github.com/Zillode","followers_url":"https://api.github.com/users/Zillode/followers","following_url":"https://api.github.com/users/Zillode/following{/other_user}","gists_url":"https://api.github.com/users/Zillode/gists{/gist_id}","starred_url":"https://api.github.com/users/Zillode/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Zillode/subscriptions","organizations_url":"https://api.github.com/users/Zillode/orgs","repos_url":"https://api.github.com/users/Zillode/repos","events_url":"https://api.github.com/users/Zillode/events{/privacy}","received_events_url":"https://api.github.com/users/Zillode/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":{"url":"https://api.github.com/repos/syncthing/syncthing/milestones/2","html_url":"https://github.com/syncthing/syncthing/milestones/v1.0","labels_url":"https://api.github.com/repos/syncthing/syncthing/milestones/2/labels","id":528782,"number":2,"title":"v1.0","description":"Issues that *must* be resolved before releasing v1.0.","creator":{"login":"calmh","id":125426,"avatar_url":"https://avatars.githubusercontent.com/u/125426?v=3","gravatar_id":"","url":"https://api.github.com/users/calmh","html_url":"https://github.com/calmh","followers_url":"https://api.github.com/users/calmh/followers","following_url":"https://api.github.com/users/calmh/following{/other_user}","gists_url":"https://api.github.com/users/calmh/gists{/gist_id}","starred_url":"https://api.github.com/users/calmh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/calmh/subscriptions","organizations_url":"https://api.github.com/users/calmh/orgs","repos_url":"https://api.github.com/users/calmh/repos","events_url":"https://api.github.com/users/calmh/events{/privacy}","received_events_url":"https://api.github.com/users/calmh/received_events","type":"User","site_admin":false},"open_issues":7,"closed_issues":79,"state":"open","created_at":"2014-01-07T11:09:27Z","updated_at":"2015-04-07T10:20:37Z","due_on":null,"closed_at":null},"comments":5,"created_at":"2014-11-24T22:42:44Z","updated_at":"2015-04-07T10:35:46Z","closed_at":null,"body":"When indexes are rebuild on two machines at the about the same time, newer data can be overwritten by old data (if the machines were not fully synchronized).\r\n\r\n23:33 @calmh> basically it's not deterministic which version of a file will win when there are two of them\r\n23:34 @calmh> newest only wins with 50% certainty\r\n23:34  Zillode> there is no use of the timestamp?\r\n23:34 @calmh> no. in normal syncing, latest *change* wins, and we know when the change happens and bump versions etc.\r\n23:35 @calmh> but the change can be to an older version of a file, so the timestamp could move backwards\r\n23:35 @calmh> but when we have to trees that we merge for the first time, some better mechanism should be used\r\n"},"comment":{"url":"https://api.github.com/repos/syncthing/syncthing/issues/comments/90502718","html_url":"https://github.com/syncthing/syncthing/issues/1022#issuecomment-90502718","issue_url":"https://api.github.com/repos/syncthing/syncthing/issues/1022","id":90502718,"user":{"login":"calmh","id":125426,"avatar_url":"https://avatars.githubusercontent.com/u/125426?v=3","gravatar_id":"","url":"https://api.github.com/users/calmh","html_url":"https://github.com/calmh","followers_url":"https://api.github.com/users/calmh/followers","following_url":"https://api.github.com/users/calmh/following{/other_user}","gists_url":"https://api.github.com/users/calmh/gists{/gist_id}","starred_url":"https://api.github.com/users/calmh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/calmh/subscriptions","organizations_url":"https://api.github.com/users/calmh/orgs","repos_url":"https://api.github.com/users/calmh/repos","events_url":"https://api.github.com/users/calmh/events{/privacy}","received_events_url":"https://api.github.com/users/calmh/received_events","type":"User","site_admin":false},"created_at":"2015-04-07T10:35:46Z","updated_at":"2015-04-07T10:35:46Z","body":"Kinda maybe. It's different now anyway. But this is on my radar to take care of before v0.11 release."}}