{"action":"created","issue":{"url":"https://api.github.com/repos/BahamutDragon/pcgen/issues/574","repository_url":"https://api.github.com/repos/BahamutDragon/pcgen","labels_url":"https://api.github.com/repos/BahamutDragon/pcgen/issues/574/labels{/name}","comments_url":"https://api.github.com/repos/BahamutDragon/pcgen/issues/574/comments","events_url":"https://api.github.com/repos/BahamutDragon/pcgen/issues/574/events","html_url":"https://github.com/BahamutDragon/pcgen/pull/574","id":170624187,"number":574,"title":"Reincarnate","user":{"login":"FerretDave","id":6505949,"avatar_url":"https://avatars.githubusercontent.com/u/6505949?v=3","gravatar_id":"","url":"https://api.github.com/users/FerretDave","html_url":"https://github.com/FerretDave","followers_url":"https://api.github.com/users/FerretDave/followers","following_url":"https://api.github.com/users/FerretDave/following{/other_user}","gists_url":"https://api.github.com/users/FerretDave/gists{/gist_id}","starred_url":"https://api.github.com/users/FerretDave/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/FerretDave/subscriptions","organizations_url":"https://api.github.com/users/FerretDave/orgs","repos_url":"https://api.github.com/users/FerretDave/repos","events_url":"https://api.github.com/users/FerretDave/events{/privacy}","received_events_url":"https://api.github.com/users/FerretDave/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2016-08-11T11:28:55Z","updated_at":"2016-08-11T22:21:57Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/BahamutDragon/pcgen/pulls/574","html_url":"https://github.com/BahamutDragon/pcgen/pull/574","diff_url":"https://github.com/BahamutDragon/pcgen/pull/574.diff","patch_url":"https://github.com/BahamutDragon/pcgen/pull/574.patch"},"body":"Hopefully this is just the latest updates now... \r\n\r\nGithub tells me this can be automatically merged with your master (from my 'Reincarnate' branch), so fingers crossed, however it had told me that before from my master..."},"comment":{"url":"https://api.github.com/repos/BahamutDragon/pcgen/issues/comments/239311508","html_url":"https://github.com/BahamutDragon/pcgen/pull/574#issuecomment-239311508","issue_url":"https://api.github.com/repos/BahamutDragon/pcgen/issues/574","id":239311508,"user":{"login":"FerretDave","id":6505949,"avatar_url":"https://avatars.githubusercontent.com/u/6505949?v=3","gravatar_id":"","url":"https://api.github.com/users/FerretDave","html_url":"https://github.com/FerretDave","followers_url":"https://api.github.com/users/FerretDave/followers","following_url":"https://api.github.com/users/FerretDave/following{/other_user}","gists_url":"https://api.github.com/users/FerretDave/gists{/gist_id}","starred_url":"https://api.github.com/users/FerretDave/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/FerretDave/subscriptions","organizations_url":"https://api.github.com/users/FerretDave/orgs","repos_url":"https://api.github.com/users/FerretDave/repos","events_url":"https://api.github.com/users/FerretDave/events{/privacy}","received_events_url":"https://api.github.com/users/FerretDave/received_events","type":"User","site_admin":false},"created_at":"2016-08-11T22:21:56Z","updated_at":"2016-08-11T22:21:56Z","body":"Greetings,\nTried that, still shows as 11 or so commits behind.\n\nI will probably copy my files, remove my repo completely, refork, refresh\nthe entire repo and then copy my files back into place to get it sorted.\n\nI know that's not the way to do it, but as a final resort I know that that\nwill do it.\nI need to figure out how to use git/branches correctly.\n\nCan you confirm - what gui/tools do you use? I've got Tortoisegit, but\nsuspect that I may be better off just using the command line (I'm a unix\nguy, so it may be more familiar).\n\nAnyway, going to be offline for 10 days now, so will sort that out another\ntime.\n\nCheers for your help and patience!\nDave\n\nOn 11 August 2016 at 15:40, Bahamut <notifications@github.com> wrote:\n\n> Mate, on your PR branch do the following:\n>\n> REBASE from MASTER. That will remove any 'Merge branch' and obsolete\n> commits that already exist in master and re-apply only new commits to your\n> working branch. Then simply do a PUSH -f (that is force-with-lease) to your\n> branch remote as you need to force a re-writing of the commit history (Push\n> will reject the changes otherwise, as the histories will not match). In an\n> ideal world you would do this before ever pushing a branch into the public\n> (to a remote).\n>\n> Post a simple message \"fixed\" or \"done as requested\" once that is\n> completed. If your commits to be Pull Requested is still 10+, then you have\n> done something wrong. Ideally, you should only be seeing commit 3fc32e2\n> <https://github.com/BahamutDragon/pcgen/commit/3fc32e247e80c571029462ca8e8f5ba7104a3c0a>\n> and newer, which is currently four commits by my count.\n>\n> Best,\n>\n> —\n> You are receiving this because you authored the thread.\n> Reply to this email directly, view it on GitHub\n> <https://github.com/BahamutDragon/pcgen/pull/574#issuecomment-239181253>,\n> or mute the thread\n> <https://github.com/notifications/unsubscribe-auth/AGNF3YQh00BESU-5VP6KG5OBJnQ8iudCks5qezRkgaJpZM4JiBxI>\n> .\n>\n"}}
{"actor":{"display_login":"FerretDave"}}