{"issue":{"created_at":"2011-10-06T11:43:20Z","state":"closed","updated_at":"2011-12-15T16:50:14Z","user":{"gravatar_id":"8c88b43c635ed013bf4101c33d0f0667","id":327833,"url":"https://api.github.com/users/dobesv","avatar_url":"https://secure.gravatar.com/avatar/8c88b43c635ed013bf4101c33d0f0667?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png","login":"dobesv"},"comments":2,"body":"Currently it is possible to create a conflicted state when pushing to nodester if you amend a commit.  This puts things in an sort of unrecoverable state from what I can tell.\r\n\r\nI think it should be possible to avoid this by specifying the merge strategy of \"theirs\" or possibly using some other git command to switch to the new HEAD, like git reset --hard or git checkout -f.\r\n","assignee":null,"id":1832991,"number":224,"pull_request":{"patch_url":null,"html_url":null,"diff_url":null},"labels":[{"name":"Contra","color":"e10c02","url":"https://api.github.com/repos/nodester/nodester/labels/Contra"}],"title":"Set merge strategy for git operations to \"theirs\"","html_url":"https://github.com/nodester/nodester/issues/224","closed_at":"2011-12-15T16:50:14Z","url":"https://api.github.com/repos/nodester/nodester/issues/224","milestone":null},"action":"created","comment":{"created_at":"2011-12-15T16:50:13Z","updated_at":"2011-12-15T16:50:13Z","user":{"gravatar_id":"e421e88e9248d199ac126fb56941b0e3","id":425716,"url":"https://api.github.com/users/Contra","avatar_url":"https://secure.gravatar.com/avatar/e421e88e9248d199ac126fb56941b0e3?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png","login":"Contra"},"body":"```nodester app gitreset``` should fix this. That's a garbage response, but V2 won't have git at all so this issue will go unfixed until then. Sorry for the inconvenience.","id":3165152,"url":"https://api.github.com/repos/nodester/nodester/issues/comments/3165152"}}