{"action":"created","issue":{"url":"https://api.github.com/repos/lzcdev/merge-conflict/issues/4","repository_url":"https://api.github.com/repos/lzcdev/merge-conflict","labels_url":"https://api.github.com/repos/lzcdev/merge-conflict/issues/4/labels{/name}","comments_url":"https://api.github.com/repos/lzcdev/merge-conflict/issues/4/comments","events_url":"https://api.github.com/repos/lzcdev/merge-conflict/issues/4/events","html_url":"https://github.com/lzcdev/merge-conflict/pull/4","id":393661700,"node_id":"MDExOlB1bGxSZXF1ZXN0MjQwNjI3Nzg0","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":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-12-22T10:17:37Z","updated_at":"2018-12-22T10:38:03Z","closed_at":null,"author_association":"NONE","pull_request":{"url":"https://api.github.com/repos/lzcdev/merge-conflict/pulls/4","html_url":"https://github.com/lzcdev/merge-conflict/pull/4","diff_url":"https://github.com/lzcdev/merge-conflict/pull/4.diff","patch_url":"https://github.com/lzcdev/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/lzcdev/merge-conflict/issues/comments/449561324","html_url":"https://github.com/lzcdev/merge-conflict/pull/4#issuecomment-449561324","issue_url":"https://api.github.com/repos/lzcdev/merge-conflict/issues/4","id":449561324,"node_id":"MDEyOklzc3VlQ29tbWVudDQ0OTU2MTMyNA==","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-12-22T10:38:03Z","updated_at":"2018-12-22T10:38:03Z","author_association":"NONE","body":"## Step 5b: Merging similar changes\n\nGood job! Remember from the last issue that your history now looks something like this, without conflicts:\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 a peer or colleague will have edited the same file in the same place as your pull request.\n\nTo demonstrate, I'll stand in as your colleague :wave:. In Pull Request https://github.com/lzcdev/merge-conflict/pull/3, you'll see that the education file has been changed. If the other pull request is merged to `master` 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/lzcdev/merge-conflict/pull/3\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"}}