{"action":"closed","number":4,"pull_request":{"url":"https://api.github.com/repos/CharlieJ20/merge-conflict/pulls/4","id":229432807,"node_id":"MDExOlB1bGxSZXF1ZXN0MjI5NDMyODA3","html_url":"https://github.com/CharlieJ20/merge-conflict/pull/4","diff_url":"https://github.com/CharlieJ20/merge-conflict/pull/4.diff","patch_url":"https://github.com/CharlieJ20/merge-conflict/pull/4.patch","issue_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/issues/4","number":4,"state":"closed","locked":false,"title":"Create your own Conflict","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 5a: Create your own conflict\n\nSo far, this pull request doesn't have any conflicts, but I have added some new branch protections to prevent you from merging before you're ready.\n\nIn the last activity, you solved a merge conflict that someone else created. This time, you'll create the merge conflict yourself.\n\n### :keyboard: Activity: Make changes on this branch\n\n1. Click on the **Files changed** tab in this pull request\n1. Click the :pencil2: found in the top right-hand corner of the `_data/education.yml` file that had been previously modified\n1. Modify the content in the `degree:`, `uni:`, `year:`, and `summary:` lines\n1. Scroll to the bottom of the page and enter a commit message for your change\n1. Click the **Commit changes** button, making sure the \"Commit directly to the **add-education** branch\" option is selected\n\n<hr>\n<h3 align=\"center\">Watch below for my response</h3>\n","created_at":"2018-11-08T16:39:39Z","updated_at":"2018-11-09T11:39:47Z","closed_at":"2018-11-09T11:39:46Z","merged_at":"2018-11-09T11:39:46Z","merge_commit_sha":"922b4daf74ba364dc3b390dc069913e8cc39288d","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/pulls/4/commits","review_comments_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/pulls/4/comments","review_comment_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/pulls/comments{/number}","comments_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/issues/4/comments","statuses_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/statuses/5e5b8ad64590d71c0dc92d3db39ef2baef38c07a","head":{"label":"CharlieJ20:add-education","ref":"add-education","sha":"5e5b8ad64590d71c0dc92d3db39ef2baef38c07a","user":{"login":"CharlieJ20","id":44838852,"node_id":"MDQ6VXNlcjQ0ODM4ODUy","avatar_url":"https://avatars1.githubusercontent.com/u/44838852?v=4","gravatar_id":"","url":"https://api.github.com/users/CharlieJ20","html_url":"https://github.com/CharlieJ20","followers_url":"https://api.github.com/users/CharlieJ20/followers","following_url":"https://api.github.com/users/CharlieJ20/following{/other_user}","gists_url":"https://api.github.com/users/CharlieJ20/gists{/gist_id}","starred_url":"https://api.github.com/users/CharlieJ20/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CharlieJ20/subscriptions","organizations_url":"https://api.github.com/users/CharlieJ20/orgs","repos_url":"https://api.github.com/users/CharlieJ20/repos","events_url":"https://api.github.com/users/CharlieJ20/events{/privacy}","received_events_url":"https://api.github.com/users/CharlieJ20/received_events","type":"User","site_admin":false},"repo":{"id":156737588,"node_id":"MDEwOlJlcG9zaXRvcnkxNTY3Mzc1ODg=","name":"merge-conflict","full_name":"CharlieJ20/merge-conflict","private":false,"owner":{"login":"CharlieJ20","id":44838852,"node_id":"MDQ6VXNlcjQ0ODM4ODUy","avatar_url":"https://avatars1.githubusercontent.com/u/44838852?v=4","gravatar_id":"","url":"https://api.github.com/users/CharlieJ20","html_url":"https://github.com/CharlieJ20","followers_url":"https://api.github.com/users/CharlieJ20/followers","following_url":"https://api.github.com/users/CharlieJ20/following{/other_user}","gists_url":"https://api.github.com/users/CharlieJ20/gists{/gist_id}","starred_url":"https://api.github.com/users/CharlieJ20/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CharlieJ20/subscriptions","organizations_url":"https://api.github.com/users/CharlieJ20/orgs","repos_url":"https://api.github.com/users/CharlieJ20/repos","events_url":"https://api.github.com/users/CharlieJ20/events{/privacy}","received_events_url":"https://api.github.com/users/CharlieJ20/received_events","type":"User","site_admin":false},"html_url":"https://github.com/CharlieJ20/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/CharlieJ20/merge-conflict","forks_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/forks","keys_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/teams","hooks_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/events","assignees_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/tags","blobs_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/subscription","commits_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/merges","archive_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/downloads","issues_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/deployments","created_at":"2018-11-08T16:39:29Z","updated_at":"2018-11-09T11:31:10Z","pushed_at":"2018-11-09T11:39:46Z","git_url":"git://github.com/CharlieJ20/merge-conflict.git","ssh_url":"git@github.com:CharlieJ20/merge-conflict.git","clone_url":"https://github.com/CharlieJ20/merge-conflict.git","svn_url":"https://github.com/CharlieJ20/merge-conflict","homepage":"https://lab.github.com/githubtraining/managing-merge-conflicts","size":1201,"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":"CharlieJ20:master","ref":"master","sha":"c88613b28a108742af6589be76d003b290ceca4a","user":{"login":"CharlieJ20","id":44838852,"node_id":"MDQ6VXNlcjQ0ODM4ODUy","avatar_url":"https://avatars1.githubusercontent.com/u/44838852?v=4","gravatar_id":"","url":"https://api.github.com/users/CharlieJ20","html_url":"https://github.com/CharlieJ20","followers_url":"https://api.github.com/users/CharlieJ20/followers","following_url":"https://api.github.com/users/CharlieJ20/following{/other_user}","gists_url":"https://api.github.com/users/CharlieJ20/gists{/gist_id}","starred_url":"https://api.github.com/users/CharlieJ20/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CharlieJ20/subscriptions","organizations_url":"https://api.github.com/users/CharlieJ20/orgs","repos_url":"https://api.github.com/users/CharlieJ20/repos","events_url":"https://api.github.com/users/CharlieJ20/events{/privacy}","received_events_url":"https://api.github.com/users/CharlieJ20/received_events","type":"User","site_admin":false},"repo":{"id":156737588,"node_id":"MDEwOlJlcG9zaXRvcnkxNTY3Mzc1ODg=","name":"merge-conflict","full_name":"CharlieJ20/merge-conflict","private":false,"owner":{"login":"CharlieJ20","id":44838852,"node_id":"MDQ6VXNlcjQ0ODM4ODUy","avatar_url":"https://avatars1.githubusercontent.com/u/44838852?v=4","gravatar_id":"","url":"https://api.github.com/users/CharlieJ20","html_url":"https://github.com/CharlieJ20","followers_url":"https://api.github.com/users/CharlieJ20/followers","following_url":"https://api.github.com/users/CharlieJ20/following{/other_user}","gists_url":"https://api.github.com/users/CharlieJ20/gists{/gist_id}","starred_url":"https://api.github.com/users/CharlieJ20/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CharlieJ20/subscriptions","organizations_url":"https://api.github.com/users/CharlieJ20/orgs","repos_url":"https://api.github.com/users/CharlieJ20/repos","events_url":"https://api.github.com/users/CharlieJ20/events{/privacy}","received_events_url":"https://api.github.com/users/CharlieJ20/received_events","type":"User","site_admin":false},"html_url":"https://github.com/CharlieJ20/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/CharlieJ20/merge-conflict","forks_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/forks","keys_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/teams","hooks_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/events","assignees_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/tags","blobs_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/subscription","commits_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/merges","archive_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/downloads","issues_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/CharlieJ20/merge-conflict/deployments","created_at":"2018-11-08T16:39:29Z","updated_at":"2018-11-09T11:31:10Z","pushed_at":"2018-11-09T11:39:46Z","git_url":"git://github.com/CharlieJ20/merge-conflict.git","ssh_url":"git@github.com:CharlieJ20/merge-conflict.git","clone_url":"https://github.com/CharlieJ20/merge-conflict.git","svn_url":"https://github.com/CharlieJ20/merge-conflict","homepage":"https://lab.github.com/githubtraining/managing-merge-conflicts","size":1201,"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/CharlieJ20/merge-conflict/pulls/4"},"html":{"href":"https://github.com/CharlieJ20/merge-conflict/pull/4"},"issue":{"href":"https://api.github.com/repos/CharlieJ20/merge-conflict/issues/4"},"comments":{"href":"https://api.github.com/repos/CharlieJ20/merge-conflict/issues/4/comments"},"review_comments":{"href":"https://api.github.com/repos/CharlieJ20/merge-conflict/pulls/4/comments"},"review_comment":{"href":"https://api.github.com/repos/CharlieJ20/merge-conflict/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/CharlieJ20/merge-conflict/pulls/4/commits"},"statuses":{"href":"https://api.github.com/repos/CharlieJ20/merge-conflict/statuses/5e5b8ad64590d71c0dc92d3db39ef2baef38c07a"}},"author_association":"NONE","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"CharlieJ20","id":44838852,"node_id":"MDQ6VXNlcjQ0ODM4ODUy","avatar_url":"https://avatars1.githubusercontent.com/u/44838852?v=4","gravatar_id":"","url":"https://api.github.com/users/CharlieJ20","html_url":"https://github.com/CharlieJ20","followers_url":"https://api.github.com/users/CharlieJ20/followers","following_url":"https://api.github.com/users/CharlieJ20/following{/other_user}","gists_url":"https://api.github.com/users/CharlieJ20/gists{/gist_id}","starred_url":"https://api.github.com/users/CharlieJ20/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CharlieJ20/subscriptions","organizations_url":"https://api.github.com/users/CharlieJ20/orgs","repos_url":"https://api.github.com/users/CharlieJ20/repos","events_url":"https://api.github.com/users/CharlieJ20/events{/privacy}","received_events_url":"https://api.github.com/users/CharlieJ20/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":4,"additions":5,"deletions":5,"changed_files":1}}
{"actor":{"display_login":"CharlieJ20"}}