{"action":"created","issue":{"url":"https://api.github.com/repos/kylemacey/merge-conflict/issues/1","repository_url":"https://api.github.com/repos/kylemacey/merge-conflict","labels_url":"https://api.github.com/repos/kylemacey/merge-conflict/issues/1/labels{/name}","comments_url":"https://api.github.com/repos/kylemacey/merge-conflict/issues/1/comments","events_url":"https://api.github.com/repos/kylemacey/merge-conflict/issues/1/events","html_url":"https://github.com/kylemacey/merge-conflict/pull/1","id":316054492,"number":1,"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},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-04-19T21:53:55Z","updated_at":"2018-04-19T21:59:20Z","closed_at":null,"author_association":"NONE","pull_request":{"url":"https://api.github.com/repos/kylemacey/merge-conflict/pulls/1","html_url":"https://github.com/kylemacey/merge-conflict/pull/1","diff_url":"https://github.com/kylemacey/merge-conflict/pull/1.diff","patch_url":"https://github.com/kylemacey/merge-conflict/pull/1.patch"},"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"},"comment":{"url":"https://api.github.com/repos/kylemacey/merge-conflict/issues/comments/382893726","html_url":"https://github.com/kylemacey/merge-conflict/pull/1#issuecomment-382893726","issue_url":"https://api.github.com/repos/kylemacey/merge-conflict/issues/1","id":382893726,"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},"created_at":"2018-04-19T21:59:19Z","updated_at":"2018-04-19T21:59:19Z","author_association":"NONE","body":"## Step 4: Merge the first resolved pull request\n\nYou did it @kylemacey! Nice job resolving that conflict. Most conflicts in your day to day experience should be pretty simple, like in that activity. You might need to contact some of your peers to discuss resolution, but if your team is regularly working together and reviewing pull requests, resolving conflicts is easy.\n\n### What just happened?\n\nResolving a conflict doesn't automatically merge the Pull Request in GitHub. Instead, it stores the resolution of the conflict in a merge commit and allows you (and your team) to keep working.\n\nTo resolve a conflict, GitHub performs what is known as a reverse merge. This means that the changes from the `master` branch were successfully merged into your `update-config` branch.\n\nIn other words, merging your branch in to `master` would result in this:\n\n![merge after conflict](https://user-images.githubusercontent.com/13326548/36703509-c8bab1ec-1b10-11e8-80ac-5398e066a18d.png)\n\nBut with a reverse merge, only the `update-config` branch is updated:\n\n![reverse merge after conflict](https://user-images.githubusercontent.com/13326548/36703516-d31730ac-1b10-11e8-8e4d-0fa17baead36.png)\n\nThis is a good thing. It allows you to test the resolved code on your branch before you merge it into `master`, which is supposed to serve as production ready, bug free code.\n\n### :keyboard: Activity: Merge this pull request\n\nGo ahead and merge this pull request now.\n\n1. Click **Merge pull request** below\n1. Click **Confirm merge**\n1. Click **Delete branch** and get ready for your next activity\n\n<hr>\n<h3 align=\"center\">Watch below for my response</h3>\n"}}
{"actor":{"display_login":"github-learning-lab"}}