{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/kurumai/merge-conflict/pulls/1","id":183338655,"html_url":"https://github.com/kurumai/merge-conflict/pull/1","diff_url":"https://github.com/kurumai/merge-conflict/pull/1.diff","patch_url":"https://github.com/kurumai/merge-conflict/pull/1.patch","issue_url":"https://api.github.com/repos/kurumai/merge-conflict/issues/1","number":1,"state":"closed","locked":false,"title":"Second merge: Let's try a 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},"body":"## Step 3: Resolve a simple conflict\n\nYou may merge a lot of pull requests before you encounter your first merge conflict. That’s because Git is really smart when it comes merging. However, most of the time, you won't know you have a conflict until you create the pull request.\n\nThis branch is a great example. In this scenario, two of our friends have been working in this repository. They both created branches, changed the `_config.yml` file and opened pull requests. One pull request merged in to master without any problem, but now the other pull request shows a conflict.\n\nThe history of master and this branch look something like this:\n\n![deviated branches](https://user-images.githubusercontent.com/13326548/36703493-b8f4d5ee-1b10-11e8-9f95-4ec9993fe704.png)\n\nHowever, since this pull request also changes the same lines in the `_config.yml` file, there is a merge conflict.\n\nLet's help our friends resolve this conflict.\n\n### :keyboard: Activity: Resolving your first conflict\n\nHere's how you can fix this merge conflict:\n\n1. In the \"This branch has conflicts that must be resolved\" section of the Pull Request (below, keep scrolling), click the **Resolve conflicts** button.\n1. Look for the highlighted sections that begins with  `<<<<<<<  update-config` and ends with `>>>>>>> master`. These markers are added by Git to show you the content that is in conflict.\n1. Remove the changes made on the master branch by deleting all of the content below the `=======` and above `>>>>>>> master`.\n1. Next, remove the merge conflict markers by deleting the following lines:\n\n       <<<<<<< update-config\n       =======\n       >>>>>>> master\n\n1. **Optional:** If you're thinking about using this resume, you can edit the `_config.yml` file with your own information now. Change any of the lines within the file, even outside of where the markers were. More about this below.\n1. With the merge conflict markers removed, click **Mark as resolved**.\n1. Finally, click **Commit merge**.\n\n> Sometimes the correct way to resolve a merge conflict is to add completely different content or to keep all of the changes made on both branches. This is why Git needs a human to look at the code and make the proper fixes.\n\n<hr>\n<h3 align=\"center\">Watch below for my response</h3>\n","created_at":"2018-04-23T06:41:22Z","updated_at":"2018-04-23T23:46:47Z","closed_at":"2018-04-23T23:46:47Z","merged_at":"2018-04-23T23:46:47Z","merge_commit_sha":"b8654d18b8f0d14b034b1df8b9818519e0b7056c","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/kurumai/merge-conflict/pulls/1/commits","review_comments_url":"https://api.github.com/repos/kurumai/merge-conflict/pulls/1/comments","review_comment_url":"https://api.github.com/repos/kurumai/merge-conflict/pulls/comments{/number}","comments_url":"https://api.github.com/repos/kurumai/merge-conflict/issues/1/comments","statuses_url":"https://api.github.com/repos/kurumai/merge-conflict/statuses/41d7ae3e789e62fd20d17ffb23079f53ea2de304","head":{"label":"kurumai:update-config","ref":"update-config","sha":"41d7ae3e789e62fd20d17ffb23079f53ea2de304","user":{"login":"kurumai","id":465474,"avatar_url":"https://avatars0.githubusercontent.com/u/465474?v=4","gravatar_id":"","url":"https://api.github.com/users/kurumai","html_url":"https://github.com/kurumai","followers_url":"https://api.github.com/users/kurumai/followers","following_url":"https://api.github.com/users/kurumai/following{/other_user}","gists_url":"https://api.github.com/users/kurumai/gists{/gist_id}","starred_url":"https://api.github.com/users/kurumai/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kurumai/subscriptions","organizations_url":"https://api.github.com/users/kurumai/orgs","repos_url":"https://api.github.com/users/kurumai/repos","events_url":"https://api.github.com/users/kurumai/events{/privacy}","received_events_url":"https://api.github.com/users/kurumai/received_events","type":"User","site_admin":false},"repo":{"id":130651347,"name":"merge-conflict","full_name":"kurumai/merge-conflict","owner":{"login":"kurumai","id":465474,"avatar_url":"https://avatars0.githubusercontent.com/u/465474?v=4","gravatar_id":"","url":"https://api.github.com/users/kurumai","html_url":"https://github.com/kurumai","followers_url":"https://api.github.com/users/kurumai/followers","following_url":"https://api.github.com/users/kurumai/following{/other_user}","gists_url":"https://api.github.com/users/kurumai/gists{/gist_id}","starred_url":"https://api.github.com/users/kurumai/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kurumai/subscriptions","organizations_url":"https://api.github.com/users/kurumai/orgs","repos_url":"https://api.github.com/users/kurumai/repos","events_url":"https://api.github.com/users/kurumai/events{/privacy}","received_events_url":"https://api.github.com/users/kurumai/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/kurumai/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/kurumai/merge-conflict","forks_url":"https://api.github.com/repos/kurumai/merge-conflict/forks","keys_url":"https://api.github.com/repos/kurumai/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/kurumai/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/kurumai/merge-conflict/teams","hooks_url":"https://api.github.com/repos/kurumai/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/kurumai/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/kurumai/merge-conflict/events","assignees_url":"https://api.github.com/repos/kurumai/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/kurumai/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/kurumai/merge-conflict/tags","blobs_url":"https://api.github.com/repos/kurumai/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/kurumai/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/kurumai/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/kurumai/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/kurumai/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/kurumai/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/kurumai/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/kurumai/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/kurumai/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/kurumai/merge-conflict/subscription","commits_url":"https://api.github.com/repos/kurumai/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/kurumai/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/kurumai/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/kurumai/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/kurumai/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/kurumai/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/kurumai/merge-conflict/merges","archive_url":"https://api.github.com/repos/kurumai/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/kurumai/merge-conflict/downloads","issues_url":"https://api.github.com/repos/kurumai/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/kurumai/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/kurumai/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/kurumai/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/kurumai/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/kurumai/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/kurumai/merge-conflict/deployments","created_at":"2018-04-23T06:41:17Z","updated_at":"2018-04-23T23:39:15Z","pushed_at":"2018-04-23T23:46:47Z","git_url":"git://github.com/kurumai/merge-conflict.git","ssh_url":"git@github.com:kurumai/merge-conflict.git","clone_url":"https://github.com/kurumai/merge-conflict.git","svn_url":"https://github.com/kurumai/merge-conflict","homepage":"https://lab.github.com/courses/managing-merge-conflicts","size":1200,"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":3,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit"},"forks":0,"open_issues":3,"watchers":0,"default_branch":"master"}},"base":{"label":"kurumai:master","ref":"master","sha":"d47b8e9a0aeeb86a61ed300fa944cbdd6780f6e8","user":{"login":"kurumai","id":465474,"avatar_url":"https://avatars0.githubusercontent.com/u/465474?v=4","gravatar_id":"","url":"https://api.github.com/users/kurumai","html_url":"https://github.com/kurumai","followers_url":"https://api.github.com/users/kurumai/followers","following_url":"https://api.github.com/users/kurumai/following{/other_user}","gists_url":"https://api.github.com/users/kurumai/gists{/gist_id}","starred_url":"https://api.github.com/users/kurumai/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kurumai/subscriptions","organizations_url":"https://api.github.com/users/kurumai/orgs","repos_url":"https://api.github.com/users/kurumai/repos","events_url":"https://api.github.com/users/kurumai/events{/privacy}","received_events_url":"https://api.github.com/users/kurumai/received_events","type":"User","site_admin":false},"repo":{"id":130651347,"name":"merge-conflict","full_name":"kurumai/merge-conflict","owner":{"login":"kurumai","id":465474,"avatar_url":"https://avatars0.githubusercontent.com/u/465474?v=4","gravatar_id":"","url":"https://api.github.com/users/kurumai","html_url":"https://github.com/kurumai","followers_url":"https://api.github.com/users/kurumai/followers","following_url":"https://api.github.com/users/kurumai/following{/other_user}","gists_url":"https://api.github.com/users/kurumai/gists{/gist_id}","starred_url":"https://api.github.com/users/kurumai/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kurumai/subscriptions","organizations_url":"https://api.github.com/users/kurumai/orgs","repos_url":"https://api.github.com/users/kurumai/repos","events_url":"https://api.github.com/users/kurumai/events{/privacy}","received_events_url":"https://api.github.com/users/kurumai/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/kurumai/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/kurumai/merge-conflict","forks_url":"https://api.github.com/repos/kurumai/merge-conflict/forks","keys_url":"https://api.github.com/repos/kurumai/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/kurumai/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/kurumai/merge-conflict/teams","hooks_url":"https://api.github.com/repos/kurumai/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/kurumai/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/kurumai/merge-conflict/events","assignees_url":"https://api.github.com/repos/kurumai/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/kurumai/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/kurumai/merge-conflict/tags","blobs_url":"https://api.github.com/repos/kurumai/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/kurumai/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/kurumai/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/kurumai/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/kurumai/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/kurumai/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/kurumai/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/kurumai/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/kurumai/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/kurumai/merge-conflict/subscription","commits_url":"https://api.github.com/repos/kurumai/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/kurumai/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/kurumai/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/kurumai/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/kurumai/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/kurumai/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/kurumai/merge-conflict/merges","archive_url":"https://api.github.com/repos/kurumai/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/kurumai/merge-conflict/downloads","issues_url":"https://api.github.com/repos/kurumai/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/kurumai/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/kurumai/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/kurumai/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/kurumai/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/kurumai/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/kurumai/merge-conflict/deployments","created_at":"2018-04-23T06:41:17Z","updated_at":"2018-04-23T23:39:15Z","pushed_at":"2018-04-23T23:46:47Z","git_url":"git://github.com/kurumai/merge-conflict.git","ssh_url":"git@github.com:kurumai/merge-conflict.git","clone_url":"https://github.com/kurumai/merge-conflict.git","svn_url":"https://github.com/kurumai/merge-conflict","homepage":"https://lab.github.com/courses/managing-merge-conflicts","size":1200,"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":3,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit"},"forks":0,"open_issues":3,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/kurumai/merge-conflict/pulls/1"},"html":{"href":"https://github.com/kurumai/merge-conflict/pull/1"},"issue":{"href":"https://api.github.com/repos/kurumai/merge-conflict/issues/1"},"comments":{"href":"https://api.github.com/repos/kurumai/merge-conflict/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/kurumai/merge-conflict/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/kurumai/merge-conflict/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/kurumai/merge-conflict/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/kurumai/merge-conflict/statuses/41d7ae3e789e62fd20d17ffb23079f53ea2de304"}},"author_association":"NONE","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"kurumai","id":465474,"avatar_url":"https://avatars0.githubusercontent.com/u/465474?v=4","gravatar_id":"","url":"https://api.github.com/users/kurumai","html_url":"https://github.com/kurumai","followers_url":"https://api.github.com/users/kurumai/followers","following_url":"https://api.github.com/users/kurumai/following{/other_user}","gists_url":"https://api.github.com/users/kurumai/gists{/gist_id}","starred_url":"https://api.github.com/users/kurumai/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kurumai/subscriptions","organizations_url":"https://api.github.com/users/kurumai/orgs","repos_url":"https://api.github.com/users/kurumai/repos","events_url":"https://api.github.com/users/kurumai/events{/privacy}","received_events_url":"https://api.github.com/users/kurumai/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":6,"deletions":6,"changed_files":1}}
{"actor":{"display_login":"kurumai"}}