{"action":"created","issue":{"url":"https://api.github.com/repos/buttonmen-dev/buttonmen/issues/2048","repository_url":"https://api.github.com/repos/buttonmen-dev/buttonmen","labels_url":"https://api.github.com/repos/buttonmen-dev/buttonmen/issues/2048/labels{/name}","comments_url":"https://api.github.com/repos/buttonmen-dev/buttonmen/issues/2048/comments","events_url":"https://api.github.com/repos/buttonmen-dev/buttonmen/issues/2048/events","html_url":"https://github.com/buttonmen-dev/buttonmen/pull/2048","id":162721495,"number":2048,"title":"Added turbo","user":{"login":"blackshadowshade","id":2898401,"avatar_url":"https://avatars.githubusercontent.com/u/2898401?v=3","gravatar_id":"","url":"https://api.github.com/users/blackshadowshade","html_url":"https://github.com/blackshadowshade","followers_url":"https://api.github.com/users/blackshadowshade/followers","following_url":"https://api.github.com/users/blackshadowshade/following{/other_user}","gists_url":"https://api.github.com/users/blackshadowshade/gists{/gist_id}","starred_url":"https://api.github.com/users/blackshadowshade/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/blackshadowshade/subscriptions","organizations_url":"https://api.github.com/users/blackshadowshade/orgs","repos_url":"https://api.github.com/users/blackshadowshade/repos","events_url":"https://api.github.com/users/blackshadowshade/events{/privacy}","received_events_url":"https://api.github.com/users/blackshadowshade/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":{"login":"cgolubi1","id":2898207,"avatar_url":"https://avatars.githubusercontent.com/u/2898207?v=3","gravatar_id":"","url":"https://api.github.com/users/cgolubi1","html_url":"https://github.com/cgolubi1","followers_url":"https://api.github.com/users/cgolubi1/followers","following_url":"https://api.github.com/users/cgolubi1/following{/other_user}","gists_url":"https://api.github.com/users/cgolubi1/gists{/gist_id}","starred_url":"https://api.github.com/users/cgolubi1/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cgolubi1/subscriptions","organizations_url":"https://api.github.com/users/cgolubi1/orgs","repos_url":"https://api.github.com/users/cgolubi1/repos","events_url":"https://api.github.com/users/cgolubi1/events{/privacy}","received_events_url":"https://api.github.com/users/cgolubi1/received_events","type":"User","site_admin":false},"assignees":[{"login":"cgolubi1","id":2898207,"avatar_url":"https://avatars.githubusercontent.com/u/2898207?v=3","gravatar_id":"","url":"https://api.github.com/users/cgolubi1","html_url":"https://github.com/cgolubi1","followers_url":"https://api.github.com/users/cgolubi1/followers","following_url":"https://api.github.com/users/cgolubi1/following{/other_user}","gists_url":"https://api.github.com/users/cgolubi1/gists{/gist_id}","starred_url":"https://api.github.com/users/cgolubi1/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cgolubi1/subscriptions","organizations_url":"https://api.github.com/users/cgolubi1/orgs","repos_url":"https://api.github.com/users/cgolubi1/repos","events_url":"https://api.github.com/users/cgolubi1/events{/privacy}","received_events_url":"https://api.github.com/users/cgolubi1/received_events","type":"User","site_admin":false}],"milestone":null,"comments":38,"created_at":"2016-06-28T15:54:05Z","updated_at":"2017-01-01T05:44:34Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/buttonmen-dev/buttonmen/pulls/2048","html_url":"https://github.com/buttonmen-dev/buttonmen/pull/2048","diff_url":"https://github.com/buttonmen-dev/buttonmen/pull/2048.diff","patch_url":"https://github.com/buttonmen-dev/buttonmen/pull/2048.patch"},"body":"Addresses much of #91.\n\nThis pull request implements the guts of turbo swing/option and an initial suggestion for the turbo UI. Logging is currently not present, since this will be added by Chaos.\n\nI've tested with Zeppo vs Mister Peach, and Paris vs bobby 5150, and it looks like basic turbo works fine. No explicit testing has been done for interactions with other skills.\n\nhttp://jenkins.buttonweavers.com:8080/job/buttonmen-blackshadowshade/1181/\n"},"comment":{"url":"https://api.github.com/repos/buttonmen-dev/buttonmen/issues/comments/269893025","html_url":"https://github.com/buttonmen-dev/buttonmen/pull/2048#issuecomment-269893025","issue_url":"https://api.github.com/repos/buttonmen-dev/buttonmen/issues/2048","id":269893025,"user":{"login":"irilyth","id":4923138,"avatar_url":"https://avatars.githubusercontent.com/u/4923138?v=3","gravatar_id":"","url":"https://api.github.com/users/irilyth","html_url":"https://github.com/irilyth","followers_url":"https://api.github.com/users/irilyth/followers","following_url":"https://api.github.com/users/irilyth/following{/other_user}","gists_url":"https://api.github.com/users/irilyth/gists{/gist_id}","starred_url":"https://api.github.com/users/irilyth/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/irilyth/subscriptions","organizations_url":"https://api.github.com/users/irilyth/orgs","repos_url":"https://api.github.com/users/irilyth/repos","events_url":"https://api.github.com/users/irilyth/events{/privacy}","received_events_url":"https://api.github.com/users/irilyth/received_events","type":"User","site_admin":false},"created_at":"2017-01-01T05:44:34Z","updated_at":"2017-01-01T05:44:34Z","body":"> so maybe master in your fork isn't up to date with master in upstream?\r\n\r\nI think that's it. In my clone of your fork, I did\r\n\r\n    git remote add upstream git@github.com:buttonmen-dev/buttonmen.git\r\n    git fetch upstream\r\n\r\nand then\r\n\r\n    git diff origin/master upstream/master --stat\r\n\r\nshows a bunch of changes, \"17 files changed, 48 insertions(+), 9 deletions(-)\" being the bottom line. So you probably want to push that to origin/master, like so:\r\n\r\n    git checkout master\r\n    git pull upstream master\r\n    git push origin master\r\n\r\nThen the diff with your branch should be smaller:\r\n\r\n    git diff master 91_turbo_swing --stat\r\n\r\nsays \"26 files changed, 863 insertions(+), 369 deletions(-)\" as the bottom line, and\r\n\r\n    git diff master 91_turbo_swing > turbo.patch\r\n\r\ngives a patch file which seems at a glance to be more just about Turbo.\r\n\r\nSo if that is, you should then be able to do\r\n\r\n    git checkout master\r\n    git checkout -b 91_turbo_swing_one_commit # or whatever, some new branch name\r\n    git apply turbo.patch\r\n\r\nand then\r\n\r\n    git diff --stat\r\n\r\nshould say \"26 files changed, 863 insertions(+), 369 deletions(-)\", just like the bottom line of 'git diff master 91_turbo_swing --stat' before.\r\n\r\nYou can verify that by lookingaround, and then do\r\n\r\n    git commit -m \"Consolidated amalgamated Turbo Swing commit.\" -a\r\n\r\nor whatever, and voila. Put in a PR, and sleep the sleep of the just.\r\n\r\n(And, if other changes come in to master before your PR is merged, rebase your branch onto master, and push it again. I think this shouuld work:\r\n\r\n    git checkout master\r\n    git pull upstream master\r\n    git push origin master\r\n    git checkout 91_turbo_swing_one_commit\r\n    git rebase master\r\n    git push --force origin HEAD\r\n\r\nI think I haven't fully tested that sequence with Github PRs, but I think it'll work. I intend to try it once there are changes in upstream/master to rebase onto. :^)"}}
{"actor":{"display_login":"irilyth"}}