{"action":"created","issue":{"url":"https://api.github.com/repos/haskoin/haskoin/issues/265","repository_url":"https://api.github.com/repos/haskoin/haskoin","labels_url":"https://api.github.com/repos/haskoin/haskoin/issues/265/labels{/name}","comments_url":"https://api.github.com/repos/haskoin/haskoin/issues/265/comments","events_url":"https://api.github.com/repos/haskoin/haskoin/issues/265/events","html_url":"https://github.com/haskoin/haskoin/pull/265","id":137724428,"number":265,"title":"Parsed satoshi core txvalidjson tests","user":{"login":"tphyahoo","id":1337,"avatar_url":"https://avatars.githubusercontent.com/u/1337?v=3","gravatar_id":"","url":"https://api.github.com/users/tphyahoo","html_url":"https://github.com/tphyahoo","followers_url":"https://api.github.com/users/tphyahoo/followers","following_url":"https://api.github.com/users/tphyahoo/following{/other_user}","gists_url":"https://api.github.com/users/tphyahoo/gists{/gist_id}","starred_url":"https://api.github.com/users/tphyahoo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tphyahoo/subscriptions","organizations_url":"https://api.github.com/users/tphyahoo/orgs","repos_url":"https://api.github.com/users/tphyahoo/repos","events_url":"https://api.github.com/users/tphyahoo/events{/privacy}","received_events_url":"https://api.github.com/users/tphyahoo/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":3,"created_at":"2016-03-01T23:46:15Z","updated_at":"2016-03-02T17:39:09Z","closed_at":"2016-03-02T17:39:09Z","pull_request":{"url":"https://api.github.com/repos/haskoin/haskoin/pulls/265","html_url":"https://github.com/haskoin/haskoin/pull/265","diff_url":"https://github.com/haskoin/haskoin/pull/265.diff","patch_url":"https://github.com/haskoin/haskoin/pull/265.patch"},"body":"parses test description in json, gives better feedback in tests."},"comment":{"url":"https://api.github.com/repos/haskoin/haskoin/issues/comments/191343777","html_url":"https://github.com/haskoin/haskoin/pull/265#issuecomment-191343777","issue_url":"https://api.github.com/repos/haskoin/haskoin/issues/265","id":191343777,"user":{"login":"tphyahoo","id":1337,"avatar_url":"https://avatars.githubusercontent.com/u/1337?v=3","gravatar_id":"","url":"https://api.github.com/users/tphyahoo","html_url":"https://github.com/tphyahoo","followers_url":"https://api.github.com/users/tphyahoo/followers","following_url":"https://api.github.com/users/tphyahoo/following{/other_user}","gists_url":"https://api.github.com/users/tphyahoo/gists{/gist_id}","starred_url":"https://api.github.com/users/tphyahoo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tphyahoo/subscriptions","organizations_url":"https://api.github.com/users/tphyahoo/orgs","repos_url":"https://api.github.com/users/tphyahoo/repos","events_url":"https://api.github.com/users/tphyahoo/events{/privacy}","received_events_url":"https://api.github.com/users/tphyahoo/received_events","type":"User","site_admin":false},"created_at":"2016-03-02T17:39:09Z","updated_at":"2016-03-02T17:39:09Z","body":"I followed the procedure described, and I understand how to resolve merge-conflicted files.\r\n\r\nThe trouble is, \r\n\r\n1) none of the options in this merge-conflicted file include my most recent changes, in at least one instance.  I could fix this manually, but since git appears not to be working as advertising, it makes me paranoid that I'm missing something else.\r\n\r\n2) I went ahead and tried to move forward regardless, and git refused rebase --continue even then.\r\n\r\n```\r\n➜  haskoin-core git:(55077a7) git status\r\nrebase in progress; onto 55077a7\r\nYou are currently rebasing branch 'parsed_satoshi_core_txvalidjson_tests' on '55077a7'.\r\n  (all conflicts fixed: run \"git rebase --continue\")\r\n\r\nnothing to commit, working directory clean\r\n➜  haskoin-core git:(55077a7) git rebase --continue\r\nApplying: transaction unit tests: type sigs, comments\r\nNo changes - did you forget to use 'git add'?\r\nIf there is nothing left to stage, chances are that something else\r\nalready introduced the same changes; you might want to skip this patch.\r\n\r\nWhen you have resolved this problem, run \"git rebase --continue\".\r\nIf you prefer to skip this patch, run \"git rebase --skip\" instead.\r\nTo check out the original branch and stop rebasing, run \"git rebase --abort\".\r\n```\r\n\r\nSo, I'm thinking I hit a git bug and it's probably time to throw in the towel and start a new branch.\r\n\r\nI'll close this and do that."}}