{"action":"created","issue":{"url":"https://api.github.com/repos/sorin-ionescu/prezto/issues/1419","repository_url":"https://api.github.com/repos/sorin-ionescu/prezto","labels_url":"https://api.github.com/repos/sorin-ionescu/prezto/issues/1419/labels{/name}","comments_url":"https://api.github.com/repos/sorin-ionescu/prezto/issues/1419/comments","events_url":"https://api.github.com/repos/sorin-ionescu/prezto/issues/1419/events","html_url":"https://github.com/sorin-ionescu/prezto/issues/1419","id":248490059,"number":1419,"title":"When developing - how to handle merge conflicts in runcoms/z...","user":{"login":"jeeftor","id":6491743,"avatar_url":"https://avatars3.githubusercontent.com/u/6491743?v=4","gravatar_id":"","url":"https://api.github.com/users/jeeftor","html_url":"https://github.com/jeeftor","followers_url":"https://api.github.com/users/jeeftor/followers","following_url":"https://api.github.com/users/jeeftor/following{/other_user}","gists_url":"https://api.github.com/users/jeeftor/gists{/gist_id}","starred_url":"https://api.github.com/users/jeeftor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jeeftor/subscriptions","organizations_url":"https://api.github.com/users/jeeftor/orgs","repos_url":"https://api.github.com/users/jeeftor/repos","events_url":"https://api.github.com/users/jeeftor/events{/privacy}","received_events_url":"https://api.github.com/users/jeeftor/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2017-08-07T18:16:06Z","updated_at":"2017-08-07T18:44:07Z","closed_at":null,"body":"I'm wondering how folks who are working on the code handle merge conflicts with \r\n\r\n\r\n\tmodified:   runcoms/zlogin\r\n\tmodified:   runcoms/zpreztorc\r\n\tmodified:   runcoms/zshrc\r\n\r\nEvery time i pull from upstream I have a conflict with these guys.  Whats the best practice to use for these guys?"},"comment":{"url":"https://api.github.com/repos/sorin-ionescu/prezto/issues/comments/320747070","html_url":"https://github.com/sorin-ionescu/prezto/issues/1419#issuecomment-320747070","issue_url":"https://api.github.com/repos/sorin-ionescu/prezto/issues/1419","id":320747070,"user":{"login":"diraol","id":192702,"avatar_url":"https://avatars1.githubusercontent.com/u/192702?v=4","gravatar_id":"","url":"https://api.github.com/users/diraol","html_url":"https://github.com/diraol","followers_url":"https://api.github.com/users/diraol/followers","following_url":"https://api.github.com/users/diraol/following{/other_user}","gists_url":"https://api.github.com/users/diraol/gists{/gist_id}","starred_url":"https://api.github.com/users/diraol/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/diraol/subscriptions","organizations_url":"https://api.github.com/users/diraol/orgs","repos_url":"https://api.github.com/users/diraol/repos","events_url":"https://api.github.com/users/diraol/events{/privacy}","received_events_url":"https://api.github.com/users/diraol/received_events","type":"User","site_admin":false},"created_at":"2017-08-07T18:44:07Z","updated_at":"2017-08-07T18:44:07Z","body":"There is no best practice for it for now, despite handling git conflicts by hand.\r\n\r\nHere is a proposal to deal with it:\r\nhttps://github.com/sorin-ionescu/prezto/pull/1346\r\n\r\nYet under discussion."}}
{"actor":{"display_login":"diraol"}}