{"action":"created","issue":{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/196","labels_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/196/labels{/name}","comments_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/196/comments","events_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/196/events","html_url":"https://github.com/smashwilson/merge-conflicts/issues/196","id":124071917,"number":196,"title":"Doesn't find merge conflicts tags in open file","user":{"login":"msheaver","id":1430178,"avatar_url":"https://avatars.githubusercontent.com/u/1430178?v=3","gravatar_id":"","url":"https://api.github.com/users/msheaver","html_url":"https://github.com/msheaver","followers_url":"https://api.github.com/users/msheaver/followers","following_url":"https://api.github.com/users/msheaver/following{/other_user}","gists_url":"https://api.github.com/users/msheaver/gists{/gist_id}","starred_url":"https://api.github.com/users/msheaver/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/msheaver/subscriptions","organizations_url":"https://api.github.com/users/msheaver/orgs","repos_url":"https://api.github.com/users/msheaver/repos","events_url":"https://api.github.com/users/msheaver/events{/privacy}","received_events_url":"https://api.github.com/users/msheaver/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-12-28T14:04:44Z","updated_at":"2015-12-28T14:55:14Z","closed_at":null,"body":"When I run this on an open file that has merge conflicts (see attached), it doesn't find them. Is there something I am doing wrong here?\r\n\r\n![capture](https://cloud.githubusercontent.com/assets/1430178/12019706/d25fb59c-ad41-11e5-9281-5445ad719904.JPG)\r\n"},"comment":{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/comments/167584031","html_url":"https://github.com/smashwilson/merge-conflicts/issues/196#issuecomment-167584031","issue_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/196","id":167584031,"user":{"login":"smashwilson","id":17565,"avatar_url":"https://avatars.githubusercontent.com/u/17565?v=3","gravatar_id":"","url":"https://api.github.com/users/smashwilson","html_url":"https://github.com/smashwilson","followers_url":"https://api.github.com/users/smashwilson/followers","following_url":"https://api.github.com/users/smashwilson/following{/other_user}","gists_url":"https://api.github.com/users/smashwilson/gists{/gist_id}","starred_url":"https://api.github.com/users/smashwilson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/smashwilson/subscriptions","organizations_url":"https://api.github.com/users/smashwilson/orgs","repos_url":"https://api.github.com/users/smashwilson/repos","events_url":"https://api.github.com/users/smashwilson/events{/privacy}","received_events_url":"https://api.github.com/users/smashwilson/received_events","type":"User","site_admin":false},"created_at":"2015-12-28T14:55:14Z","updated_at":"2015-12-28T14:55:14Z","body":"Is git aware that the file has conflicts, or is there a chance it was erroneously marked as resolved?\r\n\r\nTry running `git status` (and `git status --porcelain`) at the command-line to check. If the path in question _is_ showing up as conflicted and the package just isn't detecting it, paste the `git status --porcelain` output here and I can try to figure out why it isn't."}}