{"action":"created","issue":{"url":"https://api.github.com/repos/UprootLabs/gngr/issues/187","labels_url":"https://api.github.com/repos/UprootLabs/gngr/issues/187/labels{/name}","comments_url":"https://api.github.com/repos/UprootLabs/gngr/issues/187/comments","events_url":"https://api.github.com/repos/UprootLabs/gngr/issues/187/events","html_url":"https://github.com/UprootLabs/gngr/pull/187","id":113435080,"number":187,"title":"I167 attrib pixels","user":{"login":"atiqsayyed","id":2395804,"avatar_url":"https://avatars.githubusercontent.com/u/2395804?v=3","gravatar_id":"","url":"https://api.github.com/users/atiqsayyed","html_url":"https://github.com/atiqsayyed","followers_url":"https://api.github.com/users/atiqsayyed/followers","following_url":"https://api.github.com/users/atiqsayyed/following{/other_user}","gists_url":"https://api.github.com/users/atiqsayyed/gists{/gist_id}","starred_url":"https://api.github.com/users/atiqsayyed/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/atiqsayyed/subscriptions","organizations_url":"https://api.github.com/users/atiqsayyed/orgs","repos_url":"https://api.github.com/users/atiqsayyed/repos","events_url":"https://api.github.com/users/atiqsayyed/events{/privacy}","received_events_url":"https://api.github.com/users/atiqsayyed/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-10-26T19:40:07Z","updated_at":"2015-10-27T08:00:43Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/UprootLabs/gngr/pulls/187","html_url":"https://github.com/UprootLabs/gngr/pull/187","diff_url":"https://github.com/UprootLabs/gngr/pull/187.diff","patch_url":"https://github.com/UprootLabs/gngr/pull/187.patch"},"body":"Fixing pixel sizes in case of \"px\" for HTML values"},"comment":{"url":"https://api.github.com/repos/UprootLabs/gngr/issues/comments/151406658","html_url":"https://github.com/UprootLabs/gngr/pull/187#issuecomment-151406658","issue_url":"https://api.github.com/repos/UprootLabs/gngr/issues/187","id":151406658,"user":{"login":"hrj","id":345879,"avatar_url":"https://avatars.githubusercontent.com/u/345879?v=3","gravatar_id":"","url":"https://api.github.com/users/hrj","html_url":"https://github.com/hrj","followers_url":"https://api.github.com/users/hrj/followers","following_url":"https://api.github.com/users/hrj/following{/other_user}","gists_url":"https://api.github.com/users/hrj/gists{/gist_id}","starred_url":"https://api.github.com/users/hrj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hrj/subscriptions","organizations_url":"https://api.github.com/users/hrj/orgs","repos_url":"https://api.github.com/users/hrj/repos","events_url":"https://api.github.com/users/hrj/events{/privacy}","received_events_url":"https://api.github.com/users/hrj/received_events","type":"User","site_admin":false},"created_at":"2015-10-27T08:00:43Z","updated_at":"2015-10-27T08:00:43Z","body":"That rebase didn't go too well; especially the merge conflicts.\r\n\r\nThe simplest way out is this:\r\n\r\nDownload [this patch](https://patch-diff.githubusercontent.com/raw/UprootLabs/gngr/pull/186.diff) to some file `xyz`.\r\n\r\nThen,\r\n```\r\ngit checkout upstream/master\r\ngit checkout -b someBranch\r\ngit apply xyz\r\n```\r\n\r\nReview your changes, make commits, push branch, and make new PR.\r\n\r\nThe above can be also done with `interactive rebase`, but it requires good understanding of how it works. It might be best to spend a day or two in familiarizing with git, and how branches work. It will pay off in the long run.\r\n\r\n"}}