{"action":"opened","number":5,"pull_request":{"url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/pulls/5","id":218871629,"node_id":"MDExOlB1bGxSZXF1ZXN0MjE4ODcxNjI5","html_url":"https://github.com/AnuragAmbuj/merge-conflict/pull/5","diff_url":"https://github.com/AnuragAmbuj/merge-conflict/pull/5.diff","patch_url":"https://github.com/AnuragAmbuj/merge-conflict/pull/5.patch","issue_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/issues/5","number":5,"state":"open","locked":false,"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},"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","created_at":"2018-09-28T07:01:01Z","updated_at":"2018-09-28T07:01:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/pulls/5/commits","review_comments_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/pulls/5/comments","review_comment_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/pulls/comments{/number}","comments_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/issues/5/comments","statuses_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/statuses/c0fceb99d675584bd59b9af8e975f9811482fa37","head":{"label":"AnuragAmbuj:add-experience","ref":"add-experience","sha":"c0fceb99d675584bd59b9af8e975f9811482fa37","user":{"login":"AnuragAmbuj","id":6836102,"node_id":"MDQ6VXNlcjY4MzYxMDI=","avatar_url":"https://avatars2.githubusercontent.com/u/6836102?v=4","gravatar_id":"","url":"https://api.github.com/users/AnuragAmbuj","html_url":"https://github.com/AnuragAmbuj","followers_url":"https://api.github.com/users/AnuragAmbuj/followers","following_url":"https://api.github.com/users/AnuragAmbuj/following{/other_user}","gists_url":"https://api.github.com/users/AnuragAmbuj/gists{/gist_id}","starred_url":"https://api.github.com/users/AnuragAmbuj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AnuragAmbuj/subscriptions","organizations_url":"https://api.github.com/users/AnuragAmbuj/orgs","repos_url":"https://api.github.com/users/AnuragAmbuj/repos","events_url":"https://api.github.com/users/AnuragAmbuj/events{/privacy}","received_events_url":"https://api.github.com/users/AnuragAmbuj/received_events","type":"User","site_admin":false},"repo":{"id":150699069,"node_id":"MDEwOlJlcG9zaXRvcnkxNTA2OTkwNjk=","name":"merge-conflict","full_name":"AnuragAmbuj/merge-conflict","private":false,"owner":{"login":"AnuragAmbuj","id":6836102,"node_id":"MDQ6VXNlcjY4MzYxMDI=","avatar_url":"https://avatars2.githubusercontent.com/u/6836102?v=4","gravatar_id":"","url":"https://api.github.com/users/AnuragAmbuj","html_url":"https://github.com/AnuragAmbuj","followers_url":"https://api.github.com/users/AnuragAmbuj/followers","following_url":"https://api.github.com/users/AnuragAmbuj/following{/other_user}","gists_url":"https://api.github.com/users/AnuragAmbuj/gists{/gist_id}","starred_url":"https://api.github.com/users/AnuragAmbuj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AnuragAmbuj/subscriptions","organizations_url":"https://api.github.com/users/AnuragAmbuj/orgs","repos_url":"https://api.github.com/users/AnuragAmbuj/repos","events_url":"https://api.github.com/users/AnuragAmbuj/events{/privacy}","received_events_url":"https://api.github.com/users/AnuragAmbuj/received_events","type":"User","site_admin":false},"html_url":"https://github.com/AnuragAmbuj/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict","forks_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/forks","keys_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/teams","hooks_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/events","assignees_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/tags","blobs_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/subscription","commits_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/merges","archive_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/downloads","issues_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/deployments","created_at":"2018-09-28T07:00:50Z","updated_at":"2018-09-28T07:00:58Z","pushed_at":"2018-09-28T07:01:01Z","git_url":"git://github.com/AnuragAmbuj/merge-conflict.git","ssh_url":"git@github.com:AnuragAmbuj/merge-conflict.git","clone_url":"https://github.com/AnuragAmbuj/merge-conflict.git","svn_url":"https://github.com/AnuragAmbuj/merge-conflict","homepage":"https://lab.github.com/githubtraining/managing-merge-conflicts","size":0,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":5,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":5,"watchers":0,"default_branch":"master"}},"base":{"label":"AnuragAmbuj:master","ref":"master","sha":"d8e8027d690707d7e9332c505fd27fcd0a755023","user":{"login":"AnuragAmbuj","id":6836102,"node_id":"MDQ6VXNlcjY4MzYxMDI=","avatar_url":"https://avatars2.githubusercontent.com/u/6836102?v=4","gravatar_id":"","url":"https://api.github.com/users/AnuragAmbuj","html_url":"https://github.com/AnuragAmbuj","followers_url":"https://api.github.com/users/AnuragAmbuj/followers","following_url":"https://api.github.com/users/AnuragAmbuj/following{/other_user}","gists_url":"https://api.github.com/users/AnuragAmbuj/gists{/gist_id}","starred_url":"https://api.github.com/users/AnuragAmbuj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AnuragAmbuj/subscriptions","organizations_url":"https://api.github.com/users/AnuragAmbuj/orgs","repos_url":"https://api.github.com/users/AnuragAmbuj/repos","events_url":"https://api.github.com/users/AnuragAmbuj/events{/privacy}","received_events_url":"https://api.github.com/users/AnuragAmbuj/received_events","type":"User","site_admin":false},"repo":{"id":150699069,"node_id":"MDEwOlJlcG9zaXRvcnkxNTA2OTkwNjk=","name":"merge-conflict","full_name":"AnuragAmbuj/merge-conflict","private":false,"owner":{"login":"AnuragAmbuj","id":6836102,"node_id":"MDQ6VXNlcjY4MzYxMDI=","avatar_url":"https://avatars2.githubusercontent.com/u/6836102?v=4","gravatar_id":"","url":"https://api.github.com/users/AnuragAmbuj","html_url":"https://github.com/AnuragAmbuj","followers_url":"https://api.github.com/users/AnuragAmbuj/followers","following_url":"https://api.github.com/users/AnuragAmbuj/following{/other_user}","gists_url":"https://api.github.com/users/AnuragAmbuj/gists{/gist_id}","starred_url":"https://api.github.com/users/AnuragAmbuj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AnuragAmbuj/subscriptions","organizations_url":"https://api.github.com/users/AnuragAmbuj/orgs","repos_url":"https://api.github.com/users/AnuragAmbuj/repos","events_url":"https://api.github.com/users/AnuragAmbuj/events{/privacy}","received_events_url":"https://api.github.com/users/AnuragAmbuj/received_events","type":"User","site_admin":false},"html_url":"https://github.com/AnuragAmbuj/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict","forks_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/forks","keys_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/teams","hooks_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/events","assignees_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/tags","blobs_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/subscription","commits_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/merges","archive_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/downloads","issues_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/deployments","created_at":"2018-09-28T07:00:50Z","updated_at":"2018-09-28T07:00:58Z","pushed_at":"2018-09-28T07:01:01Z","git_url":"git://github.com/AnuragAmbuj/merge-conflict.git","ssh_url":"git@github.com:AnuragAmbuj/merge-conflict.git","clone_url":"https://github.com/AnuragAmbuj/merge-conflict.git","svn_url":"https://github.com/AnuragAmbuj/merge-conflict","homepage":"https://lab.github.com/githubtraining/managing-merge-conflicts","size":0,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":5,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":5,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/pulls/5"},"html":{"href":"https://github.com/AnuragAmbuj/merge-conflict/pull/5"},"issue":{"href":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/issues/5"},"comments":{"href":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/issues/5/comments"},"review_comments":{"href":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/pulls/5/comments"},"review_comment":{"href":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/pulls/5/commits"},"statuses":{"href":"https://api.github.com/repos/AnuragAmbuj/merge-conflict/statuses/c0fceb99d675584bd59b9af8e975f9811482fa37"}},"author_association":"NONE","merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":9,"deletions":10,"changed_files":2}}
{"actor":{"display_login":"github-learning-lab"}}