{"action":"created","issue":{"url":"https://api.github.com/repos/kiinlam/merge-conflict/issues/3","repository_url":"https://api.github.com/repos/kiinlam/merge-conflict","labels_url":"https://api.github.com/repos/kiinlam/merge-conflict/issues/3/labels{/name}","comments_url":"https://api.github.com/repos/kiinlam/merge-conflict/issues/3/comments","events_url":"https://api.github.com/repos/kiinlam/merge-conflict/issues/3/events","html_url":"https://github.com/kiinlam/merge-conflict/pull/3","id":353643193,"node_id":"MDExOlB1bGxSZXF1ZXN0MjEwNjM4MDAz","number":3,"title":"Another User's Change","user":{"login":"github-learning-lab[bot]","id":37936606,"node_id":"MDM6Qm90Mzc5MzY2MDY=","avatar_url":"https://avatars0.githubusercontent.com/in/10572?v=4","gravatar_id":"","url":"https://api.github.com/users/github-learning-lab%5Bbot%5D","html_url":"https://github.com/apps/github-learning-lab","followers_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/followers","following_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/repos","events_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/received_events","type":"Bot","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-08-24T04:46:50Z","updated_at":"2018-08-24T07:37:25Z","closed_at":"2018-08-24T07:37:21Z","author_association":"CONTRIBUTOR","pull_request":{"url":"https://api.github.com/repos/kiinlam/merge-conflict/pulls/3","html_url":"https://github.com/kiinlam/merge-conflict/pull/3","diff_url":"https://github.com/kiinlam/merge-conflict/pull/3.diff","patch_url":"https://github.com/kiinlam/merge-conflict/pull/3.patch"},"body":"## Step 6: Conflicting change\n\nThis pull request adds changes to the `_data/education.yml` file. It's the same file that you just changed in your pull request.\n\nAfter you merge this pull request, your pull request will have a merge conflict. That's because there will have been changes on two different branches to the same part of the same file.\n\n### :keyboard: Activity: Approving a pull request\n\n1. In the pull request status window below, click **Add your review**\n1. When the pull request review window displays, select **Approve** and click **Submit review**\n\n<hr>\n<h3 align=\"center\">Watch below for my response</h3>\n"},"comment":{"url":"https://api.github.com/repos/kiinlam/merge-conflict/issues/comments/415678410","html_url":"https://github.com/kiinlam/merge-conflict/pull/3#issuecomment-415678410","issue_url":"https://api.github.com/repos/kiinlam/merge-conflict/issues/3","id":415678410,"node_id":"MDEyOklzc3VlQ29tbWVudDQxNTY3ODQxMA==","user":{"login":"github-learning-lab[bot]","id":37936606,"node_id":"MDM6Qm90Mzc5MzY2MDY=","avatar_url":"https://avatars0.githubusercontent.com/in/10572?v=4","gravatar_id":"","url":"https://api.github.com/users/github-learning-lab%5Bbot%5D","html_url":"https://github.com/apps/github-learning-lab","followers_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/followers","following_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/repos","events_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/github-learning-lab%5Bbot%5D/received_events","type":"Bot","site_admin":false},"created_at":"2018-08-24T07:37:25Z","updated_at":"2018-08-24T07:37:25Z","author_association":"CONTRIBUTOR","body":"I was so excited about your approval that I've merged the PR! Since we both edited the same file without a linear history, this means that now we'll have some conflicts to resolve.\n\n### :keyboard: Activity: Delete the branch\n\n1. Delete this branch\n\n<hr>\n<h3 align=\"center\">Go back to <a href=\"https://github.com/kiinlam/merge-conflict/pull/4\">your pull request</a> to resolve the conflict</h3>\n"}}
{"actor":{"display_login":"github-learning-lab"}}