{"action":"closed","number":2,"pull_request":{"url":"https://api.github.com/repos/BillKG/merge-conflict/pulls/2","id":238946235,"node_id":"MDExOlB1bGxSZXF1ZXN0MjM4OTQ2MjM1","html_url":"https://github.com/BillKG/merge-conflict/pull/2","diff_url":"https://github.com/BillKG/merge-conflict/pull/2.diff","patch_url":"https://github.com/BillKG/merge-conflict/pull/2.patch","issue_url":"https://api.github.com/repos/BillKG/merge-conflict/issues/2","number":2,"state":"closed","locked":false,"title":"Second merge: Let's try a 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},"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 to merging. Unless you're paying close attention to other branches in your repository, you usually 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, made changes to the `_config.yml` file, and opened pull requests. One pull request was merged to `master` without problems, 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, because this pull request 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 merge conflict\n\n1. At the bottom of the page in the \"This branch has conflicts that must be resolved\" section of the Pull Request, 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'd like, you can edit the `_config.yml` file with your own information. 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 best way to resolve a merge conflict is to add content that's different from both branches, or even to combine all of the changes from 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-12-16T04:35:09Z","updated_at":"2018-12-16T04:53:58Z","closed_at":"2018-12-16T04:53:58Z","merged_at":"2018-12-16T04:53:58Z","merge_commit_sha":"f1c1bc40a388839d29390b88fca56b24c06c42a1","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/BillKG/merge-conflict/pulls/2/commits","review_comments_url":"https://api.github.com/repos/BillKG/merge-conflict/pulls/2/comments","review_comment_url":"https://api.github.com/repos/BillKG/merge-conflict/pulls/comments{/number}","comments_url":"https://api.github.com/repos/BillKG/merge-conflict/issues/2/comments","statuses_url":"https://api.github.com/repos/BillKG/merge-conflict/statuses/80396b406c130eea4d761365f7eada538b1afd70","head":{"label":"BillKG:update-config","ref":"update-config","sha":"80396b406c130eea4d761365f7eada538b1afd70","user":{"login":"BillKG","id":21240283,"node_id":"MDQ6VXNlcjIxMjQwMjgz","avatar_url":"https://avatars2.githubusercontent.com/u/21240283?v=4","gravatar_id":"","url":"https://api.github.com/users/BillKG","html_url":"https://github.com/BillKG","followers_url":"https://api.github.com/users/BillKG/followers","following_url":"https://api.github.com/users/BillKG/following{/other_user}","gists_url":"https://api.github.com/users/BillKG/gists{/gist_id}","starred_url":"https://api.github.com/users/BillKG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BillKG/subscriptions","organizations_url":"https://api.github.com/users/BillKG/orgs","repos_url":"https://api.github.com/users/BillKG/repos","events_url":"https://api.github.com/users/BillKG/events{/privacy}","received_events_url":"https://api.github.com/users/BillKG/received_events","type":"User","site_admin":false},"repo":{"id":161967939,"node_id":"MDEwOlJlcG9zaXRvcnkxNjE5Njc5Mzk=","name":"merge-conflict","full_name":"BillKG/merge-conflict","private":false,"owner":{"login":"BillKG","id":21240283,"node_id":"MDQ6VXNlcjIxMjQwMjgz","avatar_url":"https://avatars2.githubusercontent.com/u/21240283?v=4","gravatar_id":"","url":"https://api.github.com/users/BillKG","html_url":"https://github.com/BillKG","followers_url":"https://api.github.com/users/BillKG/followers","following_url":"https://api.github.com/users/BillKG/following{/other_user}","gists_url":"https://api.github.com/users/BillKG/gists{/gist_id}","starred_url":"https://api.github.com/users/BillKG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BillKG/subscriptions","organizations_url":"https://api.github.com/users/BillKG/orgs","repos_url":"https://api.github.com/users/BillKG/repos","events_url":"https://api.github.com/users/BillKG/events{/privacy}","received_events_url":"https://api.github.com/users/BillKG/received_events","type":"User","site_admin":false},"html_url":"https://github.com/BillKG/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/BillKG/merge-conflict","forks_url":"https://api.github.com/repos/BillKG/merge-conflict/forks","keys_url":"https://api.github.com/repos/BillKG/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/BillKG/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/BillKG/merge-conflict/teams","hooks_url":"https://api.github.com/repos/BillKG/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/BillKG/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/BillKG/merge-conflict/events","assignees_url":"https://api.github.com/repos/BillKG/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/BillKG/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/BillKG/merge-conflict/tags","blobs_url":"https://api.github.com/repos/BillKG/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/BillKG/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/BillKG/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/BillKG/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/BillKG/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/BillKG/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/BillKG/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/BillKG/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/BillKG/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/BillKG/merge-conflict/subscription","commits_url":"https://api.github.com/repos/BillKG/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/BillKG/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/BillKG/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/BillKG/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/BillKG/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/BillKG/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/BillKG/merge-conflict/merges","archive_url":"https://api.github.com/repos/BillKG/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/BillKG/merge-conflict/downloads","issues_url":"https://api.github.com/repos/BillKG/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/BillKG/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/BillKG/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/BillKG/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/BillKG/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/BillKG/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/BillKG/merge-conflict/deployments","created_at":"2018-12-16T04:35:00Z","updated_at":"2018-12-16T04:44:07Z","pushed_at":"2018-12-16T04:53:58Z","git_url":"git://github.com/BillKG/merge-conflict.git","ssh_url":"git@github.com:BillKG/merge-conflict.git","clone_url":"https://github.com/BillKG/merge-conflict.git","svn_url":"https://github.com/BillKG/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":3,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":3,"watchers":0,"default_branch":"master"}},"base":{"label":"BillKG:master","ref":"master","sha":"7ba94137d500a1e1a0e436b81f54cd9d12f41bc6","user":{"login":"BillKG","id":21240283,"node_id":"MDQ6VXNlcjIxMjQwMjgz","avatar_url":"https://avatars2.githubusercontent.com/u/21240283?v=4","gravatar_id":"","url":"https://api.github.com/users/BillKG","html_url":"https://github.com/BillKG","followers_url":"https://api.github.com/users/BillKG/followers","following_url":"https://api.github.com/users/BillKG/following{/other_user}","gists_url":"https://api.github.com/users/BillKG/gists{/gist_id}","starred_url":"https://api.github.com/users/BillKG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BillKG/subscriptions","organizations_url":"https://api.github.com/users/BillKG/orgs","repos_url":"https://api.github.com/users/BillKG/repos","events_url":"https://api.github.com/users/BillKG/events{/privacy}","received_events_url":"https://api.github.com/users/BillKG/received_events","type":"User","site_admin":false},"repo":{"id":161967939,"node_id":"MDEwOlJlcG9zaXRvcnkxNjE5Njc5Mzk=","name":"merge-conflict","full_name":"BillKG/merge-conflict","private":false,"owner":{"login":"BillKG","id":21240283,"node_id":"MDQ6VXNlcjIxMjQwMjgz","avatar_url":"https://avatars2.githubusercontent.com/u/21240283?v=4","gravatar_id":"","url":"https://api.github.com/users/BillKG","html_url":"https://github.com/BillKG","followers_url":"https://api.github.com/users/BillKG/followers","following_url":"https://api.github.com/users/BillKG/following{/other_user}","gists_url":"https://api.github.com/users/BillKG/gists{/gist_id}","starred_url":"https://api.github.com/users/BillKG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BillKG/subscriptions","organizations_url":"https://api.github.com/users/BillKG/orgs","repos_url":"https://api.github.com/users/BillKG/repos","events_url":"https://api.github.com/users/BillKG/events{/privacy}","received_events_url":"https://api.github.com/users/BillKG/received_events","type":"User","site_admin":false},"html_url":"https://github.com/BillKG/merge-conflict","description":null,"fork":false,"url":"https://api.github.com/repos/BillKG/merge-conflict","forks_url":"https://api.github.com/repos/BillKG/merge-conflict/forks","keys_url":"https://api.github.com/repos/BillKG/merge-conflict/keys{/key_id}","collaborators_url":"https://api.github.com/repos/BillKG/merge-conflict/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/BillKG/merge-conflict/teams","hooks_url":"https://api.github.com/repos/BillKG/merge-conflict/hooks","issue_events_url":"https://api.github.com/repos/BillKG/merge-conflict/issues/events{/number}","events_url":"https://api.github.com/repos/BillKG/merge-conflict/events","assignees_url":"https://api.github.com/repos/BillKG/merge-conflict/assignees{/user}","branches_url":"https://api.github.com/repos/BillKG/merge-conflict/branches{/branch}","tags_url":"https://api.github.com/repos/BillKG/merge-conflict/tags","blobs_url":"https://api.github.com/repos/BillKG/merge-conflict/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/BillKG/merge-conflict/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/BillKG/merge-conflict/git/refs{/sha}","trees_url":"https://api.github.com/repos/BillKG/merge-conflict/git/trees{/sha}","statuses_url":"https://api.github.com/repos/BillKG/merge-conflict/statuses/{sha}","languages_url":"https://api.github.com/repos/BillKG/merge-conflict/languages","stargazers_url":"https://api.github.com/repos/BillKG/merge-conflict/stargazers","contributors_url":"https://api.github.com/repos/BillKG/merge-conflict/contributors","subscribers_url":"https://api.github.com/repos/BillKG/merge-conflict/subscribers","subscription_url":"https://api.github.com/repos/BillKG/merge-conflict/subscription","commits_url":"https://api.github.com/repos/BillKG/merge-conflict/commits{/sha}","git_commits_url":"https://api.github.com/repos/BillKG/merge-conflict/git/commits{/sha}","comments_url":"https://api.github.com/repos/BillKG/merge-conflict/comments{/number}","issue_comment_url":"https://api.github.com/repos/BillKG/merge-conflict/issues/comments{/number}","contents_url":"https://api.github.com/repos/BillKG/merge-conflict/contents/{+path}","compare_url":"https://api.github.com/repos/BillKG/merge-conflict/compare/{base}...{head}","merges_url":"https://api.github.com/repos/BillKG/merge-conflict/merges","archive_url":"https://api.github.com/repos/BillKG/merge-conflict/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/BillKG/merge-conflict/downloads","issues_url":"https://api.github.com/repos/BillKG/merge-conflict/issues{/number}","pulls_url":"https://api.github.com/repos/BillKG/merge-conflict/pulls{/number}","milestones_url":"https://api.github.com/repos/BillKG/merge-conflict/milestones{/number}","notifications_url":"https://api.github.com/repos/BillKG/merge-conflict/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/BillKG/merge-conflict/labels{/name}","releases_url":"https://api.github.com/repos/BillKG/merge-conflict/releases{/id}","deployments_url":"https://api.github.com/repos/BillKG/merge-conflict/deployments","created_at":"2018-12-16T04:35:00Z","updated_at":"2018-12-16T04:44:07Z","pushed_at":"2018-12-16T04:53:58Z","git_url":"git://github.com/BillKG/merge-conflict.git","ssh_url":"git@github.com:BillKG/merge-conflict.git","clone_url":"https://github.com/BillKG/merge-conflict.git","svn_url":"https://github.com/BillKG/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":3,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":3,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/BillKG/merge-conflict/pulls/2"},"html":{"href":"https://github.com/BillKG/merge-conflict/pull/2"},"issue":{"href":"https://api.github.com/repos/BillKG/merge-conflict/issues/2"},"comments":{"href":"https://api.github.com/repos/BillKG/merge-conflict/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/BillKG/merge-conflict/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/BillKG/merge-conflict/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/BillKG/merge-conflict/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/BillKG/merge-conflict/statuses/80396b406c130eea4d761365f7eada538b1afd70"}},"author_association":"NONE","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"BillKG","id":21240283,"node_id":"MDQ6VXNlcjIxMjQwMjgz","avatar_url":"https://avatars2.githubusercontent.com/u/21240283?v=4","gravatar_id":"","url":"https://api.github.com/users/BillKG","html_url":"https://github.com/BillKG","followers_url":"https://api.github.com/users/BillKG/followers","following_url":"https://api.github.com/users/BillKG/following{/other_user}","gists_url":"https://api.github.com/users/BillKG/gists{/gist_id}","starred_url":"https://api.github.com/users/BillKG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BillKG/subscriptions","organizations_url":"https://api.github.com/users/BillKG/orgs","repos_url":"https://api.github.com/users/BillKG/repos","events_url":"https://api.github.com/users/BillKG/events{/privacy}","received_events_url":"https://api.github.com/users/BillKG/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":8,"deletions":6,"changed_files":1}}
{"actor":{"display_login":"BillKG"}}