{"action":"created","issue":{"url":"https://api.github.com/repos/23editorcs/merge-conflict/issues/4","repository_url":"https://api.github.com/repos/23editorcs/merge-conflict","labels_url":"https://api.github.com/repos/23editorcs/merge-conflict/issues/4/labels{/name}","comments_url":"https://api.github.com/repos/23editorcs/merge-conflict/issues/4/comments","events_url":"https://api.github.com/repos/23editorcs/merge-conflict/issues/4/events","html_url":"https://github.com/23editorcs/merge-conflict/pull/4","id":354245126,"node_id":"MDExOlB1bGxSZXF1ZXN0MjExMDUzNTA5","number":4,"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":"open","locked":false,"assignee":{"login":"23editorcs","id":16790555,"node_id":"MDQ6VXNlcjE2NzkwNTU1","avatar_url":"https://avatars2.githubusercontent.com/u/16790555?v=4","gravatar_id":"","url":"https://api.github.com/users/23editorcs","html_url":"https://github.com/23editorcs","followers_url":"https://api.github.com/users/23editorcs/followers","following_url":"https://api.github.com/users/23editorcs/following{/other_user}","gists_url":"https://api.github.com/users/23editorcs/gists{/gist_id}","starred_url":"https://api.github.com/users/23editorcs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/23editorcs/subscriptions","organizations_url":"https://api.github.com/users/23editorcs/orgs","repos_url":"https://api.github.com/users/23editorcs/repos","events_url":"https://api.github.com/users/23editorcs/events{/privacy}","received_events_url":"https://api.github.com/users/23editorcs/received_events","type":"User","site_admin":false},"assignees":[{"login":"23editorcs","id":16790555,"node_id":"MDQ6VXNlcjE2NzkwNTU1","avatar_url":"https://avatars2.githubusercontent.com/u/16790555?v=4","gravatar_id":"","url":"https://api.github.com/users/23editorcs","html_url":"https://github.com/23editorcs","followers_url":"https://api.github.com/users/23editorcs/followers","following_url":"https://api.github.com/users/23editorcs/following{/other_user}","gists_url":"https://api.github.com/users/23editorcs/gists{/gist_id}","starred_url":"https://api.github.com/users/23editorcs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/23editorcs/subscriptions","organizations_url":"https://api.github.com/users/23editorcs/orgs","repos_url":"https://api.github.com/users/23editorcs/repos","events_url":"https://api.github.com/users/23editorcs/events{/privacy}","received_events_url":"https://api.github.com/users/23editorcs/received_events","type":"User","site_admin":false}],"milestone":null,"comments":1,"created_at":"2018-08-27T09:24:46Z","updated_at":"2018-08-27T09:43:32Z","closed_at":null,"author_association":"CONTRIBUTOR","pull_request":{"url":"https://api.github.com/repos/23editorcs/merge-conflict/pulls/4","html_url":"https://github.com/23editorcs/merge-conflict/pull/4","diff_url":"https://github.com/23editorcs/merge-conflict/pull/4.diff","patch_url":"https://github.com/23editorcs/merge-conflict/pull/4.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/23editorcs/merge-conflict/issues/comments/416173768","html_url":"https://github.com/23editorcs/merge-conflict/pull/4#issuecomment-416173768","issue_url":"https://api.github.com/repos/23editorcs/merge-conflict/issues/4","id":416173768,"node_id":"MDEyOklzc3VlQ29tbWVudDQxNjE3Mzc2OA==","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-27T09:43:32Z","updated_at":"2018-08-27T09:43:32Z","author_association":"CONTRIBUTOR","body":"## Step 7: Resolve conflicts you created\n\nGood job! By making commits on two branches, you've created a history just like you saw in your previous conflict.\n\n![deviated branches](https://user-images.githubusercontent.com/13326548/36703541-ef3c48f8-1b10-11e8-899f-bbaaf5927d24.png)\n\nTypically, this happens when someone else merges a branch into `master` that has commits in the same files you've been working on.\n\n### :keyboard: Activity: Resolve the conflict\n\n1. In the \"This branch has conflicts that must be resolved\" section of the pull request, click **Resolve conflicts**.\n\nBecause you created both conflicts, feel free to resolve these conflicts as you wish.\n\n> Try and test your memory without a step-by-step breakdown! If you can't remember the exact steps, [here's a link]() to your previous PR with the more detailed instructions for conflict resolution.\n\n<hr>\n<h3 align=\"center\">Watch below for my response</h3>\n"}}
{"actor":{"display_login":"github-learning-lab"}}