{"action":"created","issue":{"url":"https://api.github.com/repos/yasslab/railsguides.jp/issues/161","labels_url":"https://api.github.com/repos/yasslab/railsguides.jp/issues/161/labels{/name}","comments_url":"https://api.github.com/repos/yasslab/railsguides.jp/issues/161/comments","events_url":"https://api.github.com/repos/yasslab/railsguides.jp/issues/161/events","html_url":"https://github.com/yasslab/railsguides.jp/pull/161","id":75661655,"number":161,"title":"Merge upstream 4 2 stable","user":{"login":"hanachin","id":167012,"avatar_url":"https://avatars.githubusercontent.com/u/167012?v=3","gravatar_id":"","url":"https://api.github.com/users/hanachin","html_url":"https://github.com/hanachin","followers_url":"https://api.github.com/users/hanachin/followers","following_url":"https://api.github.com/users/hanachin/following{/other_user}","gists_url":"https://api.github.com/users/hanachin/gists{/gist_id}","starred_url":"https://api.github.com/users/hanachin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hanachin/subscriptions","organizations_url":"https://api.github.com/users/hanachin/orgs","repos_url":"https://api.github.com/users/hanachin/repos","events_url":"https://api.github.com/users/hanachin/events{/privacy}","received_events_url":"https://api.github.com/users/hanachin/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":13,"created_at":"2015-05-12T16:35:18Z","updated_at":"2015-05-13T05:50:30Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/yasslab/railsguides.jp/pulls/161","html_url":"https://github.com/yasslab/railsguides.jp/pull/161","diff_url":"https://github.com/yasslab/railsguides.jp/pull/161.diff","patch_url":"https://github.com/yasslab/railsguides.jp/pull/161.patch"},"body":"See: japaneseブランチとmasterブランチを統合したい #141\r\n\r\nrailsguides.jpのmasterブランチではないですが、\r\nrails/railsの4-2-stableブランチのguidesディレクトリ以下をマージしました。\r\nhttps://github.com/yasslab/railsguides.jp/tree/merge-upstream-4-2-stable\r\n\r\nupstreamの変更マージするためのコマンドも追加してみましたが自分の環境でしか試してないです\r\n(japaneseブランチにマージしたあとトップディレクトリで実行するの想定してます)\r\n\r\n```console\r\n$ bin/merge-upstream\r\n```"},"comment":{"url":"https://api.github.com/repos/yasslab/railsguides.jp/issues/comments/101521560","html_url":"https://github.com/yasslab/railsguides.jp/pull/161#issuecomment-101521560","issue_url":"https://api.github.com/repos/yasslab/railsguides.jp/issues/161","id":101521560,"user":{"login":"yasulab","id":155807,"avatar_url":"https://avatars.githubusercontent.com/u/155807?v=3","gravatar_id":"","url":"https://api.github.com/users/yasulab","html_url":"https://github.com/yasulab","followers_url":"https://api.github.com/users/yasulab/followers","following_url":"https://api.github.com/users/yasulab/following{/other_user}","gists_url":"https://api.github.com/users/yasulab/gists{/gist_id}","starred_url":"https://api.github.com/users/yasulab/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yasulab/subscriptions","organizations_url":"https://api.github.com/users/yasulab/orgs","repos_url":"https://api.github.com/users/yasulab/repos","events_url":"https://api.github.com/users/yasulab/events{/privacy}","received_events_url":"https://api.github.com/users/yasulab/received_events","type":"User","site_admin":false},"created_at":"2015-05-13T05:50:30Z","updated_at":"2015-05-13T05:50:30Z","body":"お、今度はうまくいったっぽいです :smile_cat: \r\n\r\n(僕が２段階認証してるので最後はエラーになっちゃってますが... :sweat_drops:  )\r\n\r\n```bash\r\n╭─○ yasulab ‹2.1.3› ~/src/github.com/yasslab/railsguides.jp.copy\r\n╰─○ bin/merge-upstream                                                     ¶ merge-upstream-4-2-stable ✗ ±\r\n+ rails=https://github.com/rails/rails.git\r\n+ railsguides_jp=https://github.com/yasslab/railsguides.jp.git\r\n++ TZ=UTC\r\n++ date +%Y%m%d%H%M%S\r\n+ d=20150513054616\r\n+ branch_upstream=4-2-stable\r\n+ branch_upstream_local=4-2-stable-20150513054616\r\n+ branch_head=merge-upstream-4-2-stable\r\n+ branch_head_local=merge-upstream-4-2-stable-20150513054616\r\n+ git fetch https://github.com/rails/rails.git 4-2-stable:4-2-stable-20150513054616\r\nFrom https://github.com/rails/rails\r\n * [new branch]      4-2-stable -> 4-2-stable-20150513054616\r\n+ git fetch https://github.com/yasslab/railsguides.jp.git merge-upstream-4-2-stable:merge-upstream-4-2-stable-20150513054616\r\nFrom https://github.com/yasslab/railsguides.jp\r\n * [new branch]      merge-upstream-4-2-stable -> merge-upstream-4-2-stable-20150513054616\r\n+ git checkout -f 4-2-stable-20150513054616\r\nSwitched to branch '4-2-stable-20150513054616'\r\n+ git reset --hard 4-2-stable-20150513054616\r\nHEAD is now at 126a92a Merge pull request #20119 from yui-knk/fix/active_record_querying\r\n+ git clean -fd\r\n+ git filter-branch -f --subdirectory-filter guides HEAD\r\nRewrite 126a92a88c776b105cb0aa8e884fabdd189ff8c7 (3100/3100)\r\nRef 'refs/heads/4-2-stable-20150513054616' was rewritten\r\n+ git checkout -f merge-upstream-4-2-stable-20150513054616\r\nSwitched to branch 'merge-upstream-4-2-stable-20150513054616'\r\n+ git reset --hard merge-upstream-4-2-stable-20150513054616\r\nHEAD is now at 3ca2f70 Move kindlerb to kindle group to avoid missing kindlegen error\r\n+ git clean -fd\r\nRemoving guides/output/images/\r\n+ git branch --merged\r\n+ grep '^[ *] 4-2-stable-20150513054616$'\r\n++ git rev-parse 4-2-stable-20150513054616\r\n+ rev=1ccea61d2808eef5da86f639f5f692cde1f8dba8\r\n+ git subtree merge --squash --prefix=guides 4-2-stable-20150513054616 -m 'Merge commit '\\''1ccea61d2808eef5da86f639f5f692cde1f8dba8'\\'' into merge-upstream-4-2-stable-20150513054616'\r\nMerge made by the 'recursive' strategy.\r\n guides/source/active_record_querying.md | 2 +-\r\n 1 file changed, 1 insertion(+), 1 deletion(-)\r\n+ git push https://github.com/yasslab/railsguides.jp.git merge-upstream-4-2-stable-20150513054616\r\nUsername for 'https://github.com': yasulab\r\nPassword for 'https://yasulab@github.com':\r\nremote: Invalid username or password.\r\nfatal: Authentication failed for 'https://github.com/yasslab/railsguides.jp.git/'\r\n```"}}