{"comment":{"url":"https://api.github.com/repos/guidoferrario/spacewar/comments/13146350","html_url":"https://github.com/guidoferrario/spacewar/commit/9c46aa97d078ad8740ff581a93a527caf8ec1e7f#commitcomment-13146350","id":13146350,"user":{"login":"guidoferrario","id":13753083,"avatar_url":"https://avatars.githubusercontent.com/u/13753083?v=3","gravatar_id":"","url":"https://api.github.com/users/guidoferrario","html_url":"https://github.com/guidoferrario","followers_url":"https://api.github.com/users/guidoferrario/followers","following_url":"https://api.github.com/users/guidoferrario/following{/other_user}","gists_url":"https://api.github.com/users/guidoferrario/gists{/gist_id}","starred_url":"https://api.github.com/users/guidoferrario/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/guidoferrario/subscriptions","organizations_url":"https://api.github.com/users/guidoferrario/orgs","repos_url":"https://api.github.com/users/guidoferrario/repos","events_url":"https://api.github.com/users/guidoferrario/events{/privacy}","received_events_url":"https://api.github.com/users/guidoferrario/received_events","type":"User","site_admin":false},"position":null,"line":null,"path":"","commit_id":"9c46aa97d078ad8740ff581a93a527caf8ec1e7f","created_at":"2015-09-09T21:07:49Z","updated_at":"2015-09-09T21:07:49Z","body":"Professor, boa noite. Para dar reset em cada um dos ramos devo usar o comando \"$ git reset --hard (nome do ramo)\" ? No momento, quando eu tento fazer o merge do \"release\" com o \"master\" há um conflito \"CONFLICT (content): Merge conflict in spacewar-rules.mdRecorded preimage for 'spacewar-rules.md'Automatic merge failed; fix conflicts and then commit the result.\"Obrigado pela atenção!Date: Tue, 8 Sep 2015 04:50:12 -0700\nFrom: notifications@github.com\nTo: spacewar@noreply.github.com\nCC: guido_ferrario@hotmail.com\nSubject: Re: [spacewar] regra de batalha: vencedor acenderá a LBP (9c46aa9)\n\nAtualizar upstream e tentar novamente.\n\n\n—\nReply to this email directly or view it on GitHub.\n\n\n  \n  \n\n\n \t\t \t   \t\t  "}}