{"action":"created","issue":{"url":"https://api.github.com/repos/libgit2/libgit2/issues/1901","labels_url":"https://api.github.com/repos/libgit2/libgit2/issues/1901/labels{/name}","comments_url":"https://api.github.com/repos/libgit2/libgit2/issues/1901/comments","events_url":"https://api.github.com/repos/libgit2/libgit2/issues/1901/events","html_url":"https://github.com/libgit2/libgit2/issues/1901","id":21229947,"number":1901,"title":"Status should report conflicts","user":{"login":"ethomson","id":1130014,"avatar_url":"https://avatars.githubusercontent.com/u/1130014?v=3","gravatar_id":"","url":"https://api.github.com/users/ethomson","html_url":"https://github.com/ethomson","followers_url":"https://api.github.com/users/ethomson/followers","following_url":"https://api.github.com/users/ethomson/following{/other_user}","gists_url":"https://api.github.com/users/ethomson/gists{/gist_id}","starred_url":"https://api.github.com/users/ethomson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ethomson/subscriptions","organizations_url":"https://api.github.com/users/ethomson/orgs","repos_url":"https://api.github.com/users/ethomson/repos","events_url":"https://api.github.com/users/ethomson/events{/privacy}","received_events_url":"https://api.github.com/users/ethomson/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":3,"created_at":"2013-10-18T16:30:13Z","updated_at":"2015-06-11T05:32:48Z","closed_at":null,"body":"It seems that status should report conflicts.  *How?*  What does this look like?\r\n\r\n`git-status` will not take the working directory into account when reporting status.  Do consumers *want* to see anything from `HEAD` or the working directory?  Or does one just want a description of the conflict (eg, `GIT_STATUS_CONFLICT_BOTH_ADDED`) and a link to the ancestor / ours / theirs data?\r\n\r\n(This is basically what we do in VS - we merge the results of status and the conflicts in the index.  And this would be my proposal, but I don't want to be short-sighted here, which is why I'm asking.)\r\n\r\nIf we *should* provide some data about HEAD or the working directory, what?  And how?"},"comment":{"url":"https://api.github.com/repos/libgit2/libgit2/issues/comments/111002156","html_url":"https://github.com/libgit2/libgit2/issues/1901#issuecomment-111002156","issue_url":"https://api.github.com/repos/libgit2/libgit2/issues/1901","id":111002156,"user":{"login":"carlosmn","id":335443,"avatar_url":"https://avatars.githubusercontent.com/u/335443?v=3","gravatar_id":"","url":"https://api.github.com/users/carlosmn","html_url":"https://github.com/carlosmn","followers_url":"https://api.github.com/users/carlosmn/followers","following_url":"https://api.github.com/users/carlosmn/following{/other_user}","gists_url":"https://api.github.com/users/carlosmn/gists{/gist_id}","starred_url":"https://api.github.com/users/carlosmn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/carlosmn/subscriptions","organizations_url":"https://api.github.com/users/carlosmn/orgs","repos_url":"https://api.github.com/users/carlosmn/repos","events_url":"https://api.github.com/users/carlosmn/events{/privacy}","received_events_url":"https://api.github.com/users/carlosmn/received_events","type":"User","site_admin":false},"created_at":"2015-06-11T05:32:48Z","updated_at":"2015-06-11T05:32:48Z","body":"@ethomson how much of this has been solved with the recent changes to status?"}}