{"action":"created","issue":{"url":"https://api.github.com/repos/eonist/GitSync/issues/45","labels_url":"https://api.github.com/repos/eonist/GitSync/issues/45/labels{/name}","comments_url":"https://api.github.com/repos/eonist/GitSync/issues/45/comments","events_url":"https://api.github.com/repos/eonist/GitSync/issues/45/events","html_url":"https://github.com/eonist/GitSync/issues/45","id":106616890,"number":45,"title":"Enhanced merge conflict dialog","user":{"login":"eonist","id":11816788,"avatar_url":"https://avatars.githubusercontent.com/u/11816788?v=3","gravatar_id":"","url":"https://api.github.com/users/eonist","html_url":"https://github.com/eonist","followers_url":"https://api.github.com/users/eonist/followers","following_url":"https://api.github.com/users/eonist/following{/other_user}","gists_url":"https://api.github.com/users/eonist/gists{/gist_id}","starred_url":"https://api.github.com/users/eonist/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eonist/subscriptions","organizations_url":"https://api.github.com/users/eonist/orgs","repos_url":"https://api.github.com/users/eonist/repos","events_url":"https://api.github.com/users/eonist/events{/privacy}","received_events_url":"https://api.github.com/users/eonist/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-09-15T18:31:02Z","updated_at":"2015-09-15T18:31:50Z","closed_at":null,"body":"- [ ] do the \"git merge --abort\" to revert to the state you were in before the merge attempt \r\n- [ ] Improve the Conflict dialog, you need to inform how many conflicts we are talking about etc\r\n- [ ] a way to step back and forth in the dialog\r\n"},"comment":{"url":"https://api.github.com/repos/eonist/GitSync/issues/comments/140492067","html_url":"https://github.com/eonist/GitSync/issues/45#issuecomment-140492067","issue_url":"https://api.github.com/repos/eonist/GitSync/issues/45","id":140492067,"user":{"login":"eonist","id":11816788,"avatar_url":"https://avatars.githubusercontent.com/u/11816788?v=3","gravatar_id":"","url":"https://api.github.com/users/eonist","html_url":"https://github.com/eonist","followers_url":"https://api.github.com/users/eonist/followers","following_url":"https://api.github.com/users/eonist/following{/other_user}","gists_url":"https://api.github.com/users/eonist/gists{/gist_id}","starred_url":"https://api.github.com/users/eonist/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eonist/subscriptions","organizations_url":"https://api.github.com/users/eonist/orgs","repos_url":"https://api.github.com/users/eonist/repos","events_url":"https://api.github.com/users/eonist/events{/privacy}","received_events_url":"https://api.github.com/users/eonist/received_events","type":"User","site_admin":false},"created_at":"2015-09-15T18:31:50Z","updated_at":"2015-09-15T18:31:50Z","body":"- [ ] To merge a local branch into another local branch:\r\n\r\nThe question here is how you refer to theirs and ours when choosing which file to use. Test this. Should be trivial to figure out.\r\n\r\n test this, so you know"}}