{"action":"closed","number":2,"pull_request":{"url":"https://api.github.com/repos/teslatickles/merge-conflict/pulls/2","id":201531587,"node_id":"MDExOlB1bGxSZXF1ZXN0MjAxNTMxNTg3","html_url":"https://github.com/teslatickles/merge-conflict/pull/2","diff_url":"https://github.com/teslatickles/merge-conflict/pull/2.diff","patch_url":"https://github.com/teslatickles/merge-conflict/pull/2.patch","issue_url":"https://api.github.com/repos/teslatickles/merge-conflict/issues/2","number":2,"state":"closed","locked":false,"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},"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","created_at":"2018-07-16T02:55:41Z","updated_at":"2018-07-16T03:58:54Z","closed_at":"2018-07-16T03:58:54Z","merged_at":"2018-07-16T03:58:54Z","merge_commit_sha":"818e77fcedb737e4cf88452c26c8b6c45dda4b02","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/teslatickles/merge-conflict/pulls/2/commits","review_comments_url":"https://api.github.com/repos/teslatickles/merge-conflict/pulls/2/comments","review_comment_url":"https://api.github.com/repos/teslatickles/merge-conflict/pulls/comments{/number}","comments_url":"https://api.github.com/repos/teslatickles/merge-conflict/issues/2/comments","statuses_url":"https://api.github.com/repos/teslatickles/merge-conflict/statuses/c66d7113fdabf853595d4ec78325cf8bcb578147","head":{"label":"teslatickles:education-conflict","ref":"education-conflict","sha":"c66d7113fdabf853595d4ec78325cf8bcb578147","user":{"login":"teslatickles","id":30253127,"node_id":"MDQ6VXNlcjMwMjUzMTI3","avatar_url":"https://avatars2.githubusercontent.com/u/30253127?v=4","gravatar_id":"","url":"https://api.github.com/users/teslatickles","html_url":"https://github.com/teslatickles","followers_url":"https://api.github.com/users/teslatickles/followers","following_url":"https://api.github.com/users/teslatickles/following{/other_user}","gists_url":"https://api.github.com/users/teslatickles/gists{/gist_id}","starred_url":"https://api.github.com/users/teslatickles/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/teslatickles/subscriptions","organizations_url":"https://api.github.com/users/teslatickles/orgs","repos_url":"https://api.github.com/users/teslatickles/repos","events_url":"https://api.github.com/users/teslatickles/events{/privacy}","received_events_url":"https://api.github.com/users/teslatickles/received_events","type":"User","site_admin":false},"repo":{"id":141079285,"node_id":"MDEwOlJlcG9zaXRvcnkxNDEwNzkyODU=","name":"merge-conflict","full_name":"teslatickles/merge-conflict","owner":{"login":"teslatickles","id":30253127,"node_id":"MDQ6VXNlcjMwMjUzMTI3","avatar_url":"https://avatars2.githubusercontent.com/u/30253127?v=4","gravatar_id":"","url":"https://api.github.com/users/teslatickles","html_url":"https://github.com/teslatickles","followers_url":"https://api.github.com/users/teslatickles/followers","following_url":"https://api.github.com/users/teslatickles/following{/other_user}","gists_url":"https://api.github.com/users/teslatickles/gists{/gist_id}","starred_url":"https://api.github.com/users/teslatickles/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/teslatickles/subscriptions","organizations_url":"https://api.github.com/users/teslatickles/orgs","repos_url":"https://api.github.com/users/teslatickles/repos","events_url":"https://api.github.com/users/teslatickles/events{/privacy}","received_events_url":"https://api.github.com/users/teslatickles/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/teslatickles/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/teslatickles/merge-conflict","forks_url":"https://api.github.com/repos/teslatickles/merge-conflict/forks","keys_url":"https://api.github.com/repos/teslatickles/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/teslatickles/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/teslatickles/merge-conflict/teams","hooks_url":"https://api.github.com/repos/teslatickles/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/teslatickles/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/teslatickles/merge-conflict/events","assignees_url":"https://api.github.com/repos/teslatickles/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/teslatickles/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/teslatickles/merge-conflict/tags","blobs_url":"https://api.github.com/repos/teslatickles/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/teslatickles/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/teslatickles/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/teslatickles/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/teslatickles/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/teslatickles/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/teslatickles/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/teslatickles/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/teslatickles/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/teslatickles/merge-conflict/subscription","commits_url":"https://api.github.com/repos/teslatickles/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/teslatickles/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/teslatickles/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/teslatickles/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/teslatickles/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/teslatickles/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/teslatickles/merge-conflict/merges","archive_url":"https://api.github.com/repos/teslatickles/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/teslatickles/merge-conflict/downloads","issues_url":"https://api.github.com/repos/teslatickles/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/teslatickles/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/teslatickles/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/teslatickles/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/teslatickles/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/teslatickles/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/teslatickles/merge-conflict/deployments","created_at":"2018-07-16T02:55:35Z","updated_at":"2018-07-16T03:45:48Z","pushed_at":"2018-07-16T03:58:54Z","git_url":"git://github.com/teslatickles/merge-conflict.git","ssh_url":"git@github.com:teslatickles/merge-conflict.git","clone_url":"https://github.com/teslatickles/merge-conflict.git","svn_url":"https://github.com/teslatickles/merge-conflict","homepage":"https://lab.github.com/courses/managing-merge-conflicts","size":1205,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":2,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":2,"watchers":0,"default_branch":"master"}},"base":{"label":"teslatickles:master","ref":"master","sha":"d8e8027d690707d7e9332c505fd27fcd0a755023","user":{"login":"teslatickles","id":30253127,"node_id":"MDQ6VXNlcjMwMjUzMTI3","avatar_url":"https://avatars2.githubusercontent.com/u/30253127?v=4","gravatar_id":"","url":"https://api.github.com/users/teslatickles","html_url":"https://github.com/teslatickles","followers_url":"https://api.github.com/users/teslatickles/followers","following_url":"https://api.github.com/users/teslatickles/following{/other_user}","gists_url":"https://api.github.com/users/teslatickles/gists{/gist_id}","starred_url":"https://api.github.com/users/teslatickles/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/teslatickles/subscriptions","organizations_url":"https://api.github.com/users/teslatickles/orgs","repos_url":"https://api.github.com/users/teslatickles/repos","events_url":"https://api.github.com/users/teslatickles/events{/privacy}","received_events_url":"https://api.github.com/users/teslatickles/received_events","type":"User","site_admin":false},"repo":{"id":141079285,"node_id":"MDEwOlJlcG9zaXRvcnkxNDEwNzkyODU=","name":"merge-conflict","full_name":"teslatickles/merge-conflict","owner":{"login":"teslatickles","id":30253127,"node_id":"MDQ6VXNlcjMwMjUzMTI3","avatar_url":"https://avatars2.githubusercontent.com/u/30253127?v=4","gravatar_id":"","url":"https://api.github.com/users/teslatickles","html_url":"https://github.com/teslatickles","followers_url":"https://api.github.com/users/teslatickles/followers","following_url":"https://api.github.com/users/teslatickles/following{/other_user}","gists_url":"https://api.github.com/users/teslatickles/gists{/gist_id}","starred_url":"https://api.github.com/users/teslatickles/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/teslatickles/subscriptions","organizations_url":"https://api.github.com/users/teslatickles/orgs","repos_url":"https://api.github.com/users/teslatickles/repos","events_url":"https://api.github.com/users/teslatickles/events{/privacy}","received_events_url":"https://api.github.com/users/teslatickles/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/teslatickles/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/teslatickles/merge-conflict","forks_url":"https://api.github.com/repos/teslatickles/merge-conflict/forks","keys_url":"https://api.github.com/repos/teslatickles/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/teslatickles/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/teslatickles/merge-conflict/teams","hooks_url":"https://api.github.com/repos/teslatickles/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/teslatickles/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/teslatickles/merge-conflict/events","assignees_url":"https://api.github.com/repos/teslatickles/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/teslatickles/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/teslatickles/merge-conflict/tags","blobs_url":"https://api.github.com/repos/teslatickles/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/teslatickles/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/teslatickles/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/teslatickles/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/teslatickles/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/teslatickles/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/teslatickles/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/teslatickles/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/teslatickles/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/teslatickles/merge-conflict/subscription","commits_url":"https://api.github.com/repos/teslatickles/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/teslatickles/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/teslatickles/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/teslatickles/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/teslatickles/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/teslatickles/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/teslatickles/merge-conflict/merges","archive_url":"https://api.github.com/repos/teslatickles/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/teslatickles/merge-conflict/downloads","issues_url":"https://api.github.com/repos/teslatickles/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/teslatickles/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/teslatickles/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/teslatickles/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/teslatickles/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/teslatickles/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/teslatickles/merge-conflict/deployments","created_at":"2018-07-16T02:55:35Z","updated_at":"2018-07-16T03:45:48Z","pushed_at":"2018-07-16T03:58:54Z","git_url":"git://github.com/teslatickles/merge-conflict.git","ssh_url":"git@github.com:teslatickles/merge-conflict.git","clone_url":"https://github.com/teslatickles/merge-conflict.git","svn_url":"https://github.com/teslatickles/merge-conflict","homepage":"https://lab.github.com/courses/managing-merge-conflicts","size":1205,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":2,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":2,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/teslatickles/merge-conflict/pulls/2"},"html":{"href":"https://github.com/teslatickles/merge-conflict/pull/2"},"issue":{"href":"https://api.github.com/repos/teslatickles/merge-conflict/issues/2"},"comments":{"href":"https://api.github.com/repos/teslatickles/merge-conflict/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/teslatickles/merge-conflict/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/teslatickles/merge-conflict/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/teslatickles/merge-conflict/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/teslatickles/merge-conflict/statuses/c66d7113fdabf853595d4ec78325cf8bcb578147"}},"author_association":"NONE","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"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},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":2,"deletions":2,"changed_files":1}}
{"actor":{"display_login":"github-learning-lab"}}