{"comment":{"url":"https://api.github.com/repos/jophinjohn/bloccit/comments/13083331","html_url":"https://github.com/jophinjohn/bloccit/commit/695adf76c76b784bed0e0ed430f062472c02318f#commitcomment-13083331","id":13083331,"user":{"login":"droberts84","id":4960334,"avatar_url":"https://avatars.githubusercontent.com/u/4960334?v=3","gravatar_id":"","url":"https://api.github.com/users/droberts84","html_url":"https://github.com/droberts84","followers_url":"https://api.github.com/users/droberts84/followers","following_url":"https://api.github.com/users/droberts84/following{/other_user}","gists_url":"https://api.github.com/users/droberts84/gists{/gist_id}","starred_url":"https://api.github.com/users/droberts84/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/droberts84/subscriptions","organizations_url":"https://api.github.com/users/droberts84/orgs","repos_url":"https://api.github.com/users/droberts84/repos","events_url":"https://api.github.com/users/droberts84/events{/privacy}","received_events_url":"https://api.github.com/users/droberts84/received_events","type":"User","site_admin":false},"position":null,"line":null,"path":"","commit_id":"695adf76c76b784bed0e0ed430f062472c02318f","created_at":"2015-09-05T19:02:44Z","updated_at":"2015-09-05T19:02:44Z","body":"What do you mean by merge tool?  It looks like whatever you are using created lots of temporary files.  You should be able to just use `git merge`, then resolve in your editor by examining any code between `>>>>>>>` and `=======` then removing the offending lines (and those auto-added markings)"}}