{"action":"created","issue":{"url":"https://api.github.com/repos/NUTFes/group-manager/issues/144","repository_url":"https://api.github.com/repos/NUTFes/group-manager","labels_url":"https://api.github.com/repos/NUTFes/group-manager/issues/144/labels{/name}","comments_url":"https://api.github.com/repos/NUTFes/group-manager/issues/144/comments","events_url":"https://api.github.com/repos/NUTFes/group-manager/issues/144/events","html_url":"https://github.com/NUTFes/group-manager/pull/144","id":162261536,"number":144,"title":"Issue55","user":{"login":"kichikawa","id":8266526,"avatar_url":"https://avatars.githubusercontent.com/u/8266526?v=3","gravatar_id":"","url":"https://api.github.com/users/kichikawa","html_url":"https://github.com/kichikawa","followers_url":"https://api.github.com/users/kichikawa/followers","following_url":"https://api.github.com/users/kichikawa/following{/other_user}","gists_url":"https://api.github.com/users/kichikawa/gists{/gist_id}","starred_url":"https://api.github.com/users/kichikawa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kichikawa/subscriptions","organizations_url":"https://api.github.com/users/kichikawa/orgs","repos_url":"https://api.github.com/users/kichikawa/repos","events_url":"https://api.github.com/users/kichikawa/events{/privacy}","received_events_url":"https://api.github.com/users/kichikawa/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2016-06-25T03:42:54Z","updated_at":"2016-06-26T15:19:58Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/NUTFes/group-manager/pulls/144","html_url":"https://github.com/NUTFes/group-manager/pull/144","diff_url":"https://github.com/NUTFes/group-manager/pull/144.diff","patch_url":"https://github.com/NUTFes/group-manager/pull/144.patch"},"body":"管理画面のindexページを編集\r\n管理画面の日本語化\r\n権限の設定"},"comment":{"url":"https://api.github.com/repos/NUTFes/group-manager/issues/comments/228606321","html_url":"https://github.com/NUTFes/group-manager/pull/144#issuecomment-228606321","issue_url":"https://api.github.com/repos/NUTFes/group-manager/issues/144","id":228606321,"user":{"login":"ShuzoN","id":5877377,"avatar_url":"https://avatars.githubusercontent.com/u/5877377?v=3","gravatar_id":"","url":"https://api.github.com/users/ShuzoN","html_url":"https://github.com/ShuzoN","followers_url":"https://api.github.com/users/ShuzoN/followers","following_url":"https://api.github.com/users/ShuzoN/following{/other_user}","gists_url":"https://api.github.com/users/ShuzoN/gists{/gist_id}","starred_url":"https://api.github.com/users/ShuzoN/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ShuzoN/subscriptions","organizations_url":"https://api.github.com/users/ShuzoN/orgs","repos_url":"https://api.github.com/users/ShuzoN/repos","events_url":"https://api.github.com/users/ShuzoN/events{/privacy}","received_events_url":"https://api.github.com/users/ShuzoN/received_events","type":"User","site_admin":false},"created_at":"2016-06-26T15:19:58Z","updated_at":"2016-06-26T15:19:58Z","body":"\r\n2 :  push する前に pullする  \r\nどうやら, このブランチはdevelopの最新状態が適応されていないみたいです....\r\n(もしかしたら, コンフリクト起きてるかも?)\r\nなので, せっかく書いてもらったのにmergeができません( TДT)\r\npushの前には, pullを行って最新状態を適応して欲しいです!\r\n\r\n```sh\r\n# まずは対象のブランチに移動\r\n$ git checkout issue55\r\n\r\n# ローカルリポジトリの状態を確認\r\n# nothing to commit, working directory cleanであればok\r\n$ git status \r\n\r\n# upstreaリポジトリの最新状態をブランチに適応\r\n$ git pull upstream develop\r\n\r\n# 変更分をリモートに反映\r\n$ git push origin issue55 # 変更点が勝手にPRにも反映される(便利!w)\r\n```\r\n\r\n **もし, pull時にコンフリクトが起きてしまったら...**  \r\n\r\n```sh\r\n$ git pull upstream develop\r\n...\r\nCONFLICT : ...   app/adimin/rental_item_allow_list.rb\r\n...\r\n\r\n# コンフリクトの解消\r\n# 正しい方の変更分を選んで上書き\r\n$ subl app/adimin/rental_item_allow_list.rb\r\n# <<HEAD\r\n# 変更点A\r\n# =========\r\n# 変更点B\r\n# >> 過去のコミット\r\n\r\n# もし,変更点Aのみを適応するなら\"変更点Aのみを残す\"\r\n# 変更点A\r\n\r\n# もし,両方のみを必要なら\"両方残す\"\r\n# << , >> , ======== は不要なので消す\r\n# 変更点A\r\n# 変更点B\r\n\r\n# indexに追加\r\n$ git add -u\r\n\r\n# 変更を前のコミットにまとめてしまう\r\n$ git commit --amend\r\n\r\n```"}}
{"actor":{"display_login":"ShuzoN"}}