{"action":"closed","number":4,"pull_request":{"url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/pulls/4","id":219176728,"node_id":"MDExOlB1bGxSZXF1ZXN0MjE5MTc2NzI4","html_url":"https://github.com/ahmed-belhadj/merge-conflict/pull/4","diff_url":"https://github.com/ahmed-belhadj/merge-conflict/pull/4.diff","patch_url":"https://github.com/ahmed-belhadj/merge-conflict/pull/4.patch","issue_url":"https://api.github.com/repos/ahmed-belhadj/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-09-30T00:36:47Z","updated_at":"2018-10-05T23:44:39Z","closed_at":"2018-10-05T23:44:39Z","merged_at":"2018-10-05T23:44:39Z","merge_commit_sha":"acb1a3f4696df4040073d38e43c574cbf41122a3","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/pulls/4/commits","review_comments_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/pulls/4/comments","review_comment_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/issues/4/comments","statuses_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/statuses/b95dbe0d2c5f136ace9f0a088dcc167500461e24","head":{"label":"ahmed-belhadj:add-education","ref":"add-education","sha":"b95dbe0d2c5f136ace9f0a088dcc167500461e24","user":{"login":"ahmed-belhadj","id":24985688,"node_id":"MDQ6VXNlcjI0OTg1Njg4","avatar_url":"https://avatars1.githubusercontent.com/u/24985688?v=4","gravatar_id":"","url":"https://api.github.com/users/ahmed-belhadj","html_url":"https://github.com/ahmed-belhadj","followers_url":"https://api.github.com/users/ahmed-belhadj/followers","following_url":"https://api.github.com/users/ahmed-belhadj/following{/other_user}","gists_url":"https://api.github.com/users/ahmed-belhadj/gists{/gist_id}","starred_url":"https://api.github.com/users/ahmed-belhadj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ahmed-belhadj/subscriptions","organizations_url":"https://api.github.com/users/ahmed-belhadj/orgs","repos_url":"https://api.github.com/users/ahmed-belhadj/repos","events_url":"https://api.github.com/users/ahmed-belhadj/events{/privacy}","received_events_url":"https://api.github.com/users/ahmed-belhadj/received_events","type":"User","site_admin":false},"repo":{"id":150914320,"node_id":"MDEwOlJlcG9zaXRvcnkxNTA5MTQzMjA=","name":"merge-conflict","full_name":"ahmed-belhadj/merge-conflict","private":false,"owner":{"login":"ahmed-belhadj","id":24985688,"node_id":"MDQ6VXNlcjI0OTg1Njg4","avatar_url":"https://avatars1.githubusercontent.com/u/24985688?v=4","gravatar_id":"","url":"https://api.github.com/users/ahmed-belhadj","html_url":"https://github.com/ahmed-belhadj","followers_url":"https://api.github.com/users/ahmed-belhadj/followers","following_url":"https://api.github.com/users/ahmed-belhadj/following{/other_user}","gists_url":"https://api.github.com/users/ahmed-belhadj/gists{/gist_id}","starred_url":"https://api.github.com/users/ahmed-belhadj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ahmed-belhadj/subscriptions","organizations_url":"https://api.github.com/users/ahmed-belhadj/orgs","repos_url":"https://api.github.com/users/ahmed-belhadj/repos","events_url":"https://api.github.com/users/ahmed-belhadj/events{/privacy}","received_events_url":"https://api.github.com/users/ahmed-belhadj/received_events","type":"User","site_admin":false},"html_url":"https://github.com/ahmed-belhadj/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict","forks_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/forks","keys_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/teams","hooks_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/events","assignees_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/tags","blobs_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/subscription","commits_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/merges","archive_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/downloads","issues_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/deployments","created_at":"2018-09-30T00:36:37Z","updated_at":"2018-10-05T23:41:58Z","pushed_at":"2018-10-05T23:44:39Z","git_url":"git://github.com/ahmed-belhadj/merge-conflict.git","ssh_url":"git@github.com:ahmed-belhadj/merge-conflict.git","clone_url":"https://github.com/ahmed-belhadj/merge-conflict.git","svn_url":"https://github.com/ahmed-belhadj/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":1,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"ahmed-belhadj:master","ref":"master","sha":"f85ce281bd328a7e01d124aaaf29167dee58473f","user":{"login":"ahmed-belhadj","id":24985688,"node_id":"MDQ6VXNlcjI0OTg1Njg4","avatar_url":"https://avatars1.githubusercontent.com/u/24985688?v=4","gravatar_id":"","url":"https://api.github.com/users/ahmed-belhadj","html_url":"https://github.com/ahmed-belhadj","followers_url":"https://api.github.com/users/ahmed-belhadj/followers","following_url":"https://api.github.com/users/ahmed-belhadj/following{/other_user}","gists_url":"https://api.github.com/users/ahmed-belhadj/gists{/gist_id}","starred_url":"https://api.github.com/users/ahmed-belhadj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ahmed-belhadj/subscriptions","organizations_url":"https://api.github.com/users/ahmed-belhadj/orgs","repos_url":"https://api.github.com/users/ahmed-belhadj/repos","events_url":"https://api.github.com/users/ahmed-belhadj/events{/privacy}","received_events_url":"https://api.github.com/users/ahmed-belhadj/received_events","type":"User","site_admin":false},"repo":{"id":150914320,"node_id":"MDEwOlJlcG9zaXRvcnkxNTA5MTQzMjA=","name":"merge-conflict","full_name":"ahmed-belhadj/merge-conflict","private":false,"owner":{"login":"ahmed-belhadj","id":24985688,"node_id":"MDQ6VXNlcjI0OTg1Njg4","avatar_url":"https://avatars1.githubusercontent.com/u/24985688?v=4","gravatar_id":"","url":"https://api.github.com/users/ahmed-belhadj","html_url":"https://github.com/ahmed-belhadj","followers_url":"https://api.github.com/users/ahmed-belhadj/followers","following_url":"https://api.github.com/users/ahmed-belhadj/following{/other_user}","gists_url":"https://api.github.com/users/ahmed-belhadj/gists{/gist_id}","starred_url":"https://api.github.com/users/ahmed-belhadj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ahmed-belhadj/subscriptions","organizations_url":"https://api.github.com/users/ahmed-belhadj/orgs","repos_url":"https://api.github.com/users/ahmed-belhadj/repos","events_url":"https://api.github.com/users/ahmed-belhadj/events{/privacy}","received_events_url":"https://api.github.com/users/ahmed-belhadj/received_events","type":"User","site_admin":false},"html_url":"https://github.com/ahmed-belhadj/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict","forks_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/forks","keys_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/teams","hooks_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/events","assignees_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/tags","blobs_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/subscription","commits_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/merges","archive_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/downloads","issues_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/deployments","created_at":"2018-09-30T00:36:37Z","updated_at":"2018-10-05T23:41:58Z","pushed_at":"2018-10-05T23:44:39Z","git_url":"git://github.com/ahmed-belhadj/merge-conflict.git","ssh_url":"git@github.com:ahmed-belhadj/merge-conflict.git","clone_url":"https://github.com/ahmed-belhadj/merge-conflict.git","svn_url":"https://github.com/ahmed-belhadj/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":1,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/pulls/4"},"html":{"href":"https://github.com/ahmed-belhadj/merge-conflict/pull/4"},"issue":{"href":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/issues/4"},"comments":{"href":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/issues/4/comments"},"review_comments":{"href":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/pulls/4/comments"},"review_comment":{"href":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/pulls/4/commits"},"statuses":{"href":"https://api.github.com/repos/ahmed-belhadj/merge-conflict/statuses/b95dbe0d2c5f136ace9f0a088dcc167500461e24"}},"author_association":"CONTRIBUTOR","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"ahmed-belhadj","id":24985688,"node_id":"MDQ6VXNlcjI0OTg1Njg4","avatar_url":"https://avatars1.githubusercontent.com/u/24985688?v=4","gravatar_id":"","url":"https://api.github.com/users/ahmed-belhadj","html_url":"https://github.com/ahmed-belhadj","followers_url":"https://api.github.com/users/ahmed-belhadj/followers","following_url":"https://api.github.com/users/ahmed-belhadj/following{/other_user}","gists_url":"https://api.github.com/users/ahmed-belhadj/gists{/gist_id}","starred_url":"https://api.github.com/users/ahmed-belhadj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ahmed-belhadj/subscriptions","organizations_url":"https://api.github.com/users/ahmed-belhadj/orgs","repos_url":"https://api.github.com/users/ahmed-belhadj/repos","events_url":"https://api.github.com/users/ahmed-belhadj/events{/privacy}","received_events_url":"https://api.github.com/users/ahmed-belhadj/received_events","type":"User","site_admin":false},"comments":3,"review_comments":0,"maintainer_can_modify":false,"commits":4,"additions":5,"deletions":5,"changed_files":1}}
{"actor":{"display_login":"ahmed-belhadj"}}