{"action":"created","issue":{"url":"https://api.github.com/repos/codingforeveryone/js/issues/18","labels_url":"https://api.github.com/repos/codingforeveryone/js/issues/18/labels{/name}","comments_url":"https://api.github.com/repos/codingforeveryone/js/issues/18/comments","events_url":"https://api.github.com/repos/codingforeveryone/js/issues/18/events","html_url":"https://github.com/codingforeveryone/js/pull/18","id":108128419,"number":18,"title":"Updated README with a few links","user":{"login":"JMurphyWeb","id":12638261,"avatar_url":"https://avatars.githubusercontent.com/u/12638261?v=3","gravatar_id":"","url":"https://api.github.com/users/JMurphyWeb","html_url":"https://github.com/JMurphyWeb","followers_url":"https://api.github.com/users/JMurphyWeb/followers","following_url":"https://api.github.com/users/JMurphyWeb/following{/other_user}","gists_url":"https://api.github.com/users/JMurphyWeb/gists{/gist_id}","starred_url":"https://api.github.com/users/JMurphyWeb/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JMurphyWeb/subscriptions","organizations_url":"https://api.github.com/users/JMurphyWeb/orgs","repos_url":"https://api.github.com/users/JMurphyWeb/repos","events_url":"https://api.github.com/users/JMurphyWeb/events{/privacy}","received_events_url":"https://api.github.com/users/JMurphyWeb/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-09-24T13:21:22Z","updated_at":"2015-09-24T18:18:14Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/codingforeveryone/js/pulls/18","html_url":"https://github.com/codingforeveryone/js/pull/18","diff_url":"https://github.com/codingforeveryone/js/pull/18.diff","patch_url":"https://github.com/codingforeveryone/js/pull/18.patch"},"body":""},"comment":{"url":"https://api.github.com/repos/codingforeveryone/js/issues/comments/143009887","html_url":"https://github.com/codingforeveryone/js/pull/18#issuecomment-143009887","issue_url":"https://api.github.com/repos/codingforeveryone/js/issues/18","id":143009887,"user":{"login":"patrickwalkowicz","id":14148737,"avatar_url":"https://avatars.githubusercontent.com/u/14148737?v=3","gravatar_id":"","url":"https://api.github.com/users/patrickwalkowicz","html_url":"https://github.com/patrickwalkowicz","followers_url":"https://api.github.com/users/patrickwalkowicz/followers","following_url":"https://api.github.com/users/patrickwalkowicz/following{/other_user}","gists_url":"https://api.github.com/users/patrickwalkowicz/gists{/gist_id}","starred_url":"https://api.github.com/users/patrickwalkowicz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/patrickwalkowicz/subscriptions","organizations_url":"https://api.github.com/users/patrickwalkowicz/orgs","repos_url":"https://api.github.com/users/patrickwalkowicz/repos","events_url":"https://api.github.com/users/patrickwalkowicz/events{/privacy}","received_events_url":"https://api.github.com/users/patrickwalkowicz/received_events","type":"User","site_admin":false},"created_at":"2015-09-24T18:18:14Z","updated_at":"2015-09-24T18:18:14Z","body":"Hi @JMurphyWeb looks like we're still having a conflict with this pull request. I've just spent some time trying to resolve it (and effectively pushed your changes into the repo using the command line). I had to do the following (quoting GitHub helper): \r\n```\r\nStep 1: From your project repository, check out a new branch and test the changes.\r\n\r\ngit checkout -b JMurphyWeb-master master\r\ngit pull https://github.com/JMurphyWeb/js.git master\r\n\r\nStep 2: Merge the changes and update on GitHub.\r\n\r\ngit checkout master\r\ngit merge --no-ff JMurphyWeb-master\r\ngit push origin master\r\n```\r\nIt worked when I made sure that I operate on a clone of codingforeveryone/js, not patrickwalkowicz/js (lesson learned :smile: ). Also learned a thing or two about vim editor. I had to manually resolve the conflict in revertString.js and pushed back. Your readme file is pushed to codingforeveryone/js. However, I'm not sure if after doing all this this pull request is supposed to still be marked as having conflicts or not."}}