{"action":"created","issue":{"url":"https://api.github.com/repos/superhcan/merge-conflict/issues/5","repository_url":"https://api.github.com/repos/superhcan/merge-conflict","labels_url":"https://api.github.com/repos/superhcan/merge-conflict/issues/5/labels{/name}","comments_url":"https://api.github.com/repos/superhcan/merge-conflict/issues/5/comments","events_url":"https://api.github.com/repos/superhcan/merge-conflict/issues/5/events","html_url":"https://github.com/superhcan/merge-conflict/pull/5","id":364807387,"node_id":"MDExOlB1bGxSZXF1ZXN0MjE4OTAzOTAx","number":5,"title":"Advanced Conflicts","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":1,"created_at":"2018-09-28T09:18:45Z","updated_at":"2018-09-28T13:33:48Z","closed_at":"2018-09-28T13:33:47Z","author_association":"CONTRIBUTOR","pull_request":{"url":"https://api.github.com/repos/superhcan/merge-conflict/pulls/5","html_url":"https://github.com/superhcan/merge-conflict/pull/5","diff_url":"https://github.com/superhcan/merge-conflict/pull/5.diff","patch_url":"https://github.com/superhcan/merge-conflict/pull/5.patch"},"body":"## Step 9: Resolve conflicts in the Advanced Conflicts pull request\n\nJust like your first conflict, this pull request is already conflicted.\n\nThis time, however, I've made it a bit more complicated.\n\n- Instead of one conflict, you get three!\n- Instead of conflicts in one file only, you get two!  \n- One of your files actually has some leftover merge conflict markers. This can happen if your colleagues resolve merge conflicts locally and forget to remove the markers.\n\n### :keyboard: Activity: Resolve these conflicts\n\n1. Click **Resolve conflicts**\n1. On the left, you will notice two files listed: `_data/experience.yml` and `_data/interests.yml`. Let's start with `experience.yml`\n1. Notice there are two distinct sets of conflict markers. This is because multiple sections of the file were modified on both branches, so Git identified the two changes within the file as two separate conflicts\n1. **Optional:** Again, if you're trying to use this course to build a resume, you can resolve the conflicting files with your own information\n1. With the merge conflicts resolved and the markers removed in the `experience.yml` file, click **Mark as resolved**\n1. GitHub will present the next file with conflicts, `interests.yml`\n1. This file has some extra merge commit markers. Simply select the Interests you would like to list and remove the others (and all those extra conflict markers)\n1. When you are finished, click **Mark as resolved**\n1. Click **Commit merge**\n\n<hr>\n<h3 align=\"center\">Watch below for my response</h3>\n"},"comment":{"url":"https://api.github.com/repos/superhcan/merge-conflict/issues/comments/425437028","html_url":"https://github.com/superhcan/merge-conflict/pull/5#issuecomment-425437028","issue_url":"https://api.github.com/repos/superhcan/merge-conflict/issues/5","id":425437028,"node_id":"MDEyOklzc3VlQ29tbWVudDQyNTQzNzAyOA==","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-09-28T13:33:48Z","updated_at":"2018-09-28T13:33:48Z","author_association":"CONTRIBUTOR","body":"Yay! You've done it! You've resolved all of the conflicts. I have a few pointers for completing your resume, so I've opened one last issue for that information.\n\n<hr>\n<h3 align=\"center\">Check out the final issue <a href=\"https://github.com/superhcan/merge-conflict/issues/7\">here</a>!</h3>\n"}}
{"actor":{"display_login":"github-learning-lab"}}