{"action":"created","issue":{"url":"https://api.github.com/repos/greattvs/merge-conflicts/issues/3","repository_url":"https://api.github.com/repos/greattvs/merge-conflicts","labels_url":"https://api.github.com/repos/greattvs/merge-conflicts/issues/3/labels{/name}","comments_url":"https://api.github.com/repos/greattvs/merge-conflicts/issues/3/comments","events_url":"https://api.github.com/repos/greattvs/merge-conflicts/issues/3/events","html_url":"https://github.com/greattvs/merge-conflicts/pull/3","id":467250794,"node_id":"MDExOlB1bGxSZXF1ZXN0Mjk2OTM5Mzk1","number":3,"title":"More 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":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2019-07-12T06:50:23Z","updated_at":"2019-07-12T06:56:44Z","closed_at":null,"author_association":"NONE","pull_request":{"url":"https://api.github.com/repos/greattvs/merge-conflicts/pulls/3","html_url":"https://github.com/greattvs/merge-conflicts/pull/3","diff_url":"https://github.com/greattvs/merge-conflicts/pull/3.diff","patch_url":"https://github.com/greattvs/merge-conflicts/pull/3.patch"},"body":"## Step 3: Resolve more complex conflicts\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 someone forgets to remove the markers while resolving a conflict.\n\n### :keyboard: Activity: Resolve these conflicts\n\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 `_data/experience.yml`.\n1. Remove the conflict markers and pick your desired content. \n1. With the merge conflicts resolved and the markers removed in the `_data/experience.yml` file, click **Mark as resolved**.\n1. GitHub will present the next file with conflicts, `_data/interests.yml`.\n1. Remove the conflict markers and pick your desired content. \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\n"},"comment":{"url":"https://api.github.com/repos/greattvs/merge-conflicts/issues/comments/510770966","html_url":"https://github.com/greattvs/merge-conflicts/pull/3#issuecomment-510770966","issue_url":"https://api.github.com/repos/greattvs/merge-conflicts/issues/3","id":510770966,"node_id":"MDEyOklzc3VlQ29tbWVudDUxMDc3MDk2Ng==","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":"2019-07-12T06:56:44Z","updated_at":"2019-07-12T06:56:44Z","author_association":"NONE","body":"## Step 4: Merge pull request\n\nGreat job, @greattvs, your pull request is free of conflicts. :tada:\n\n### :keyboard: Activity: Merge this pull request\n\nGo ahead and merge this pull request now.\n\n1. Click **Merge pull request** below.\n2. Click **Confirm Merge**.\n3. Click **Delete branch**.\n\n\n\n<hr>\n<h3 align=\"center\">Watch below for my response.</h3>\n"}}
{"actor":{"display_login":"github-learning-lab"}}