{"action":"opened","issue":{"url":"https://api.github.com/repos/SmingHub/Sming/issues/425","labels_url":"https://api.github.com/repos/SmingHub/Sming/issues/425/labels{/name}","comments_url":"https://api.github.com/repos/SmingHub/Sming/issues/425/comments","events_url":"https://api.github.com/repos/SmingHub/Sming/issues/425/events","html_url":"https://github.com/SmingHub/Sming/issues/425","id":116751964,"number":425,"title":"Conflicting change checked directly in to master","user":{"login":"raburton","id":433543,"avatar_url":"https://avatars.githubusercontent.com/u/433543?v=3","gravatar_id":"","url":"https://api.github.com/users/raburton","html_url":"https://github.com/raburton","followers_url":"https://api.github.com/users/raburton/followers","following_url":"https://api.github.com/users/raburton/following{/other_user}","gists_url":"https://api.github.com/users/raburton/gists{/gist_id}","starred_url":"https://api.github.com/users/raburton/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/raburton/subscriptions","organizations_url":"https://api.github.com/users/raburton/orgs","repos_url":"https://api.github.com/users/raburton/repos","events_url":"https://api.github.com/users/raburton/events{/privacy}","received_events_url":"https://api.github.com/users/raburton/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":0,"created_at":"2015-11-13T11:37:32Z","updated_at":"2015-11-13T11:37:32Z","closed_at":null,"body":"I notice there was recently a push directly to master that has now created a conflict with the development branch. As it is a readme displayed on the GitHub Sming main page I can understand the desire to not put this in the development branch where it would remain unseen till the next release, however this breaks the current development model and will require manual resolution and merging at the point of the next release."}}