{"action":"created","issue":{"url":"https://api.github.com/repos/adelaidasofia/merge-conflict/issues/3","repository_url":"https://api.github.com/repos/adelaidasofia/merge-conflict","labels_url":"https://api.github.com/repos/adelaidasofia/merge-conflict/issues/3/labels{/name}","comments_url":"https://api.github.com/repos/adelaidasofia/merge-conflict/issues/3/comments","events_url":"https://api.github.com/repos/adelaidasofia/merge-conflict/issues/3/events","html_url":"https://github.com/adelaidasofia/merge-conflict/pull/3","id":317025746,"number":3,"title":"Create Your Own Conflict","user":{"login":"github-learning-lab[bot]","id":37936606,"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":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-04-24T00:13:40Z","updated_at":"2018-04-25T04:54:51Z","closed_at":null,"author_association":"NONE","pull_request":{"url":"https://api.github.com/repos/adelaidasofia/merge-conflict/pulls/3","html_url":"https://github.com/adelaidasofia/merge-conflict/pull/3","diff_url":"https://github.com/adelaidasofia/merge-conflict/pull/3.diff","patch_url":"https://github.com/adelaidasofia/merge-conflict/pull/3.patch"},"body":"## Step 5a: Create your own conflict\n\nSo far, this pull request doesn't have any conflicts.  However, I have added some new branch protections so you probably see a lot of red. Don't worry, these are only in place to prevent you from merging before we are ready.\n\nIn the last activity, you solved a merge conflict, but you had help creating it. 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/adelaidasofia/merge-conflict/issues/comments/384160417","html_url":"https://github.com/adelaidasofia/merge-conflict/pull/3#issuecomment-384160417","issue_url":"https://api.github.com/repos/adelaidasofia/merge-conflict/issues/3","id":384160417,"user":{"login":"github-learning-lab[bot]","id":37936606,"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-04-25T04:54:51Z","updated_at":"2018-04-25T04:54:51Z","author_association":"NONE","body":"## Step 5b: Merging similar changes\n\nGood job! Recall from the last issue, that your history now looks something like this, and won't have any conflicts yet:\n\n![branch commits](https://user-images.githubusercontent.com/13326548/36703529-e1458976-1b10-11e8-97cb-ae4c2361bd20.png)\n\nHowever, in a real world scenario it's possible that one of your peers or colleagues will have worked on the same files or in the same places that this pull request is addressing.\n\nTo demonstrate, I'll stand in as your colleague :wave:. In Pull Request https://github.com/adelaidasofia/merge-conflict/pull/2, you'll see that the education file has been changed. If the other pull request is merged first, you will see a conflict in your pull request. Let's try it now.\n\n### :keyboard: Activity: Merge \"Another User's Change\"\n\n1. Click on https://github.com/adelaidasofia/merge-conflict/pull/2\n1. Follow the instructions in that pull request to approve it\n\n<hr>\n<h3 align=\"center\">Return to this pull request for next steps</h3>\n"}}
{"actor":{"display_login":"github-learning-lab"}}