{"action":"created","issue":{"url":"https://api.github.com/repos/odeke-em/drive/issues/114","labels_url":"https://api.github.com/repos/odeke-em/drive/issues/114/labels{/name}","comments_url":"https://api.github.com/repos/odeke-em/drive/issues/114/comments","events_url":"https://api.github.com/repos/odeke-em/drive/issues/114/events","html_url":"https://github.com/odeke-em/drive/issues/114","id":63391169,"number":114,"title":"-ignore-conflict requirement on push is too aggressive","user":{"login":"l3iggs","id":712071,"avatar_url":"https://avatars.githubusercontent.com/u/712071?v=3","gravatar_id":"","url":"https://api.github.com/users/l3iggs","html_url":"https://github.com/l3iggs","followers_url":"https://api.github.com/users/l3iggs/followers","following_url":"https://api.github.com/users/l3iggs/following{/other_user}","gists_url":"https://api.github.com/users/l3iggs/gists{/gist_id}","starred_url":"https://api.github.com/users/l3iggs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/l3iggs/subscriptions","organizations_url":"https://api.github.com/users/l3iggs/orgs","repos_url":"https://api.github.com/users/l3iggs/repos","events_url":"https://api.github.com/users/l3iggs/events{/privacy}","received_events_url":"https://api.github.com/users/l3iggs/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":8,"created_at":"2015-03-21T10:57:29Z","updated_at":"2015-03-23T15:48:27Z","closed_at":null,"body":"How to reproduce:\r\nStep 1: use `drive pull` to pull down a file\r\nStep 2: edit the file locally\r\nStep 3: use `drive push` to push the changes of that file back up to Google\r\n\r\nWhen I do this, I get an error on Step 3 with the message:\r\n\"These 1 file(s) would be overwritten. Use -ignore-conflict to override this behaviour\"\r\n\r\nThe fact is, nothing gets overwritten by pushing an updated file over an already existing file. 30 days of revisions are stored by Google Drive. I think the right thing to do here is to probably warn the user with a message along the lines of:\r\n\r\nThis push will update the following files:\r\n{list of files to be updated}\r\nRevisions of these files will be stored for 30 days and can be reverted in the web interface.\r\n\r\nBy the way, behaviour is spelled behavior :-P"},"comment":{"url":"https://api.github.com/repos/odeke-em/drive/issues/comments/85057240","html_url":"https://github.com/odeke-em/drive/issues/114#issuecomment-85057240","issue_url":"https://api.github.com/repos/odeke-em/drive/issues/114","id":85057240,"user":{"login":"odeke-em","id":4898263,"avatar_url":"https://avatars.githubusercontent.com/u/4898263?v=3","gravatar_id":"","url":"https://api.github.com/users/odeke-em","html_url":"https://github.com/odeke-em","followers_url":"https://api.github.com/users/odeke-em/followers","following_url":"https://api.github.com/users/odeke-em/following{/other_user}","gists_url":"https://api.github.com/users/odeke-em/gists{/gist_id}","starred_url":"https://api.github.com/users/odeke-em/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/odeke-em/subscriptions","organizations_url":"https://api.github.com/users/odeke-em/orgs","repos_url":"https://api.github.com/users/odeke-em/repos","events_url":"https://api.github.com/users/odeke-em/events{/privacy}","received_events_url":"https://api.github.com/users/odeke-em/received_events","type":"User","site_admin":false},"created_at":"2015-03-23T15:48:27Z","updated_at":"2015-03-23T15:48:27Z","body":"I got your point the first time. Except that every file on the cloud every file is versioned and can even be untrashed but how come users will complain of data loss?"}}