{"action":"created","issue":{"url":"https://api.github.com/repos/j2kun/lonely-hearts/issues/36","repository_url":"https://api.github.com/repos/j2kun/lonely-hearts","labels_url":"https://api.github.com/repos/j2kun/lonely-hearts/issues/36/labels{/name}","comments_url":"https://api.github.com/repos/j2kun/lonely-hearts/issues/36/comments","events_url":"https://api.github.com/repos/j2kun/lonely-hearts/issues/36/events","html_url":"https://github.com/j2kun/lonely-hearts/pull/36","id":210677711,"number":36,"title":"hearts: add scoring to a round","user":{"login":"DanielNghiem","id":11448533,"avatar_url":"https://avatars.githubusercontent.com/u/11448533?v=3","gravatar_id":"","url":"https://api.github.com/users/DanielNghiem","html_url":"https://github.com/DanielNghiem","followers_url":"https://api.github.com/users/DanielNghiem/followers","following_url":"https://api.github.com/users/DanielNghiem/following{/other_user}","gists_url":"https://api.github.com/users/DanielNghiem/gists{/gist_id}","starred_url":"https://api.github.com/users/DanielNghiem/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DanielNghiem/subscriptions","organizations_url":"https://api.github.com/users/DanielNghiem/orgs","repos_url":"https://api.github.com/users/DanielNghiem/repos","events_url":"https://api.github.com/users/DanielNghiem/events{/privacy}","received_events_url":"https://api.github.com/users/DanielNghiem/received_events","type":"User","site_admin":false},"labels":[{"id":469038754,"url":"https://api.github.com/repos/j2kun/lonely-hearts/labels/Work%20in%20progress","name":"Work in progress","color":"fef2c0","default":false}],"state":"open","locked":false,"assignee":{"login":"DanielNghiem","id":11448533,"avatar_url":"https://avatars.githubusercontent.com/u/11448533?v=3","gravatar_id":"","url":"https://api.github.com/users/DanielNghiem","html_url":"https://github.com/DanielNghiem","followers_url":"https://api.github.com/users/DanielNghiem/followers","following_url":"https://api.github.com/users/DanielNghiem/following{/other_user}","gists_url":"https://api.github.com/users/DanielNghiem/gists{/gist_id}","starred_url":"https://api.github.com/users/DanielNghiem/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DanielNghiem/subscriptions","organizations_url":"https://api.github.com/users/DanielNghiem/orgs","repos_url":"https://api.github.com/users/DanielNghiem/repos","events_url":"https://api.github.com/users/DanielNghiem/events{/privacy}","received_events_url":"https://api.github.com/users/DanielNghiem/received_events","type":"User","site_admin":false},"assignees":[{"login":"DanielNghiem","id":11448533,"avatar_url":"https://avatars.githubusercontent.com/u/11448533?v=3","gravatar_id":"","url":"https://api.github.com/users/DanielNghiem","html_url":"https://github.com/DanielNghiem","followers_url":"https://api.github.com/users/DanielNghiem/followers","following_url":"https://api.github.com/users/DanielNghiem/following{/other_user}","gists_url":"https://api.github.com/users/DanielNghiem/gists{/gist_id}","starred_url":"https://api.github.com/users/DanielNghiem/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DanielNghiem/subscriptions","organizations_url":"https://api.github.com/users/DanielNghiem/orgs","repos_url":"https://api.github.com/users/DanielNghiem/repos","events_url":"https://api.github.com/users/DanielNghiem/events{/privacy}","received_events_url":"https://api.github.com/users/DanielNghiem/received_events","type":"User","site_admin":false}],"milestone":null,"comments":0,"created_at":"2017-02-28T03:34:57Z","updated_at":"2017-02-28T07:06:17Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/j2kun/lonely-hearts/pulls/36","html_url":"https://github.com/j2kun/lonely-hearts/pull/36","diff_url":"https://github.com/j2kun/lonely-hearts/pull/36.diff","patch_url":"https://github.com/j2kun/lonely-hearts/pull/36.patch"},"body":"This PR addresses https://github.com/j2kun/lonely-hearts/issues/17"},"comment":{"url":"https://api.github.com/repos/j2kun/lonely-hearts/issues/comments/282960062","html_url":"https://github.com/j2kun/lonely-hearts/pull/36#issuecomment-282960062","issue_url":"https://api.github.com/repos/j2kun/lonely-hearts/issues/36","id":282960062,"user":{"login":"j2kun","id":2467754,"avatar_url":"https://avatars.githubusercontent.com/u/2467754?v=3","gravatar_id":"","url":"https://api.github.com/users/j2kun","html_url":"https://github.com/j2kun","followers_url":"https://api.github.com/users/j2kun/followers","following_url":"https://api.github.com/users/j2kun/following{/other_user}","gists_url":"https://api.github.com/users/j2kun/gists{/gist_id}","starred_url":"https://api.github.com/users/j2kun/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/j2kun/subscriptions","organizations_url":"https://api.github.com/users/j2kun/orgs","repos_url":"https://api.github.com/users/j2kun/repos","events_url":"https://api.github.com/users/j2kun/events{/privacy}","received_events_url":"https://api.github.com/users/j2kun/received_events","type":"User","site_admin":false},"created_at":"2017-02-28T07:06:17Z","updated_at":"2017-02-28T07:06:17Z","body":"So it looks like you have your first conflict! Congratulations :)\r\n\r\nThe thing to do is:\r\n\r\n```\r\ngit checkout master\r\ngit pull\r\ngit checkout -   # this checks out whatever branch you were on last; less typing\r\ngit rebase master\r\n```\r\n\r\nWhat this does is it puts the commits on this branch on top of what's on master. It will stop at any commit that has a conflict with some commit on master, since git doesn't know whether it's okay to overwrite the changes on master with your changes. Often it's not okay, and so you need to manually resolve the conflict.\r\n\r\nIt will stop and say something like \r\n\r\n```\r\nCONFLICT (content): Merge conflict in hearts/tests/test_round.py\r\nWhen you have resolved this problem, run \"git rebase --continue\".\r\n```\r\n\r\nThat means you have to open up this file (or if you do `git status`, any file that says \"both modified\"), and you'll see something like \r\n\r\n```\r\n<<<<<<< HEAD\r\n[STUFF THAT'S ON MASTER]\r\n=======\r\n[STUFF ON YOUR COMMIT]\r\n>>>>>>>\r\n```\r\n\r\nAnd you get to decide what to keep. In the case of this conflict, it looks like you want to keep both parts, so you'd just delete the three lines that have `<<<` and `===` and `>>>` in them. \r\n\r\nOther times, someone will make a change that you want to overwrite, or incorporate into your code somehow. The right thing to do in this situation is not always clear.\r\n\r\nAnyway, when you're done fixing the conflict, do \r\n\r\n```\r\ngit add FILE_THAT_HAD_CONFLICT      # did you know: you can also do `git add -u` to add all files that you changed since your last commit\r\ngit rebase --continue\r\n``` \r\n\r\nand it will continue trying to rebase over master. If you get another conflict, you do the same thing until it's done rebasing.\r\n\r\nLet me know if you run into any problems. If you do, you can always `git rebase --abort` to cancel the rebase."}}
{"actor":{"display_login":"j2kun"}}