{"action":"created","issue":{"url":"https://api.github.com/repos/mailcow/mailcow-dockerized/issues/1107","repository_url":"https://api.github.com/repos/mailcow/mailcow-dockerized","labels_url":"https://api.github.com/repos/mailcow/mailcow-dockerized/issues/1107/labels{/name}","comments_url":"https://api.github.com/repos/mailcow/mailcow-dockerized/issues/1107/comments","events_url":"https://api.github.com/repos/mailcow/mailcow-dockerized/issues/1107/events","html_url":"https://github.com/mailcow/mailcow-dockerized/issues/1107","id":301163464,"number":1107,"title":"Update.sh ==> Error ","user":{"login":"Anima79","id":5438831,"avatar_url":"https://avatars2.githubusercontent.com/u/5438831?v=4","gravatar_id":"","url":"https://api.github.com/users/Anima79","html_url":"https://github.com/Anima79","followers_url":"https://api.github.com/users/Anima79/followers","following_url":"https://api.github.com/users/Anima79/following{/other_user}","gists_url":"https://api.github.com/users/Anima79/gists{/gist_id}","starred_url":"https://api.github.com/users/Anima79/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Anima79/subscriptions","organizations_url":"https://api.github.com/users/Anima79/orgs","repos_url":"https://api.github.com/users/Anima79/repos","events_url":"https://api.github.com/users/Anima79/events{/privacy}","received_events_url":"https://api.github.com/users/Anima79/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":6,"created_at":"2018-02-28T20:03:51Z","updated_at":"2018-02-28T20:28:24Z","closed_at":null,"author_association":"NONE","body":"Hello,\r\nI installed a fresh copy of Mailcow Dockerized yesterday. After the dev merge to master I tried to run the update.sh today - but it throws the following error at me: \r\n\r\n```\r\nCommitting current status... Fetching updated code from remote... From https://github.com/mailcow/mailcow-dockerized\r\n * branch            master     -> FETCH_HEAD\r\nMerging local with remote code (recursive, strategy: \"theirs\", options: \"patience\"...\r\nerror: Your local changes to the following files would be overwritten by merge:\r\n        data/conf/rspamd/override.d/worker-controller-password.inc\r\nPlease commit your changes or stash them before you merge.\r\nAborting\r\n\r\nOh no, what happened?\r\n=> You most likely added files to your local mailcow instance that were now added to the official mailcow repository. Please move them to another location before updating mailcow.\r\n```\r\n\r\nWhat could be the cause of this? Should I delete the file?"},"comment":{"url":"https://api.github.com/repos/mailcow/mailcow-dockerized/issues/comments/369371961","html_url":"https://github.com/mailcow/mailcow-dockerized/issues/1107#issuecomment-369371961","issue_url":"https://api.github.com/repos/mailcow/mailcow-dockerized/issues/1107","id":369371961,"user":{"login":"andryyy","id":2972950,"avatar_url":"https://avatars0.githubusercontent.com/u/2972950?v=4","gravatar_id":"","url":"https://api.github.com/users/andryyy","html_url":"https://github.com/andryyy","followers_url":"https://api.github.com/users/andryyy/followers","following_url":"https://api.github.com/users/andryyy/following{/other_user}","gists_url":"https://api.github.com/users/andryyy/gists{/gist_id}","starred_url":"https://api.github.com/users/andryyy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/andryyy/subscriptions","organizations_url":"https://api.github.com/users/andryyy/orgs","repos_url":"https://api.github.com/users/andryyy/repos","events_url":"https://api.github.com/users/andryyy/events{/privacy}","received_events_url":"https://api.github.com/users/andryyy/received_events","type":"User","site_admin":false},"created_at":"2018-02-28T20:28:24Z","updated_at":"2018-02-28T20:28:24Z","author_association":"OWNER","body":"And what's in your logs? `docker-compose logs --tail=400 rspamd-mailcow`  after you open throughput."}}
{"actor":{"display_login":"andryyy"}}