{"action":"created","issue":{"url":"https://api.github.com/repos/vali-de-man/merge-conflict/issues/3","repository_url":"https://api.github.com/repos/vali-de-man/merge-conflict","labels_url":"https://api.github.com/repos/vali-de-man/merge-conflict/issues/3/labels{/name}","comments_url":"https://api.github.com/repos/vali-de-man/merge-conflict/issues/3/comments","events_url":"https://api.github.com/repos/vali-de-man/merge-conflict/issues/3/events","html_url":"https://github.com/vali-de-man/merge-conflict/pull/3","id":335756776,"node_id":"MDExOlB1bGxSZXF1ZXN0MTk3Mzc1Njkx","number":3,"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},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":3,"created_at":"2018-06-26T10:32:43Z","updated_at":"2018-06-26T11:20:31Z","closed_at":"2018-06-26T11:20:28Z","author_association":"CONTRIBUTOR","pull_request":{"url":"https://api.github.com/repos/vali-de-man/merge-conflict/pulls/3","html_url":"https://github.com/vali-de-man/merge-conflict/pull/3","diff_url":"https://github.com/vali-de-man/merge-conflict/pull/3.diff","patch_url":"https://github.com/vali-de-man/merge-conflict/pull/3.patch"},"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"},"comment":{"url":"https://api.github.com/repos/vali-de-man/merge-conflict/issues/comments/400272169","html_url":"https://github.com/vali-de-man/merge-conflict/pull/3#issuecomment-400272169","issue_url":"https://api.github.com/repos/vali-de-man/merge-conflict/issues/3","id":400272169,"node_id":"MDEyOklzc3VlQ29tbWVudDQwMDI3MjE2OQ==","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-06-26T11:20:31Z","updated_at":"2018-06-26T11:20:31Z","author_association":"CONTRIBUTOR","body":"## Great work\n\nYou created your first merge conflict!\n\nAre you ready to try a more complicated conflict?\n\n<hr>\n<h3 align=\"center\">Find the next conflict <a href=\"https://github.com/vali-de-man/merge-conflict/pull/4\">here</a>!</h3>\n"}}
{"actor":{"display_login":"github-learning-lab"}}