{"action":"created","issue":{"url":"https://api.github.com/repos/isaacs/github/issues/200","labels_url":"https://api.github.com/repos/isaacs/github/issues/200/labels{/name}","comments_url":"https://api.github.com/repos/isaacs/github/issues/200/comments","events_url":"https://api.github.com/repos/isaacs/github/issues/200/events","html_url":"https://github.com/isaacs/github/issues/200","id":34628106,"number":200,"title":"Resolve merge conflicts through the web interface.","user":{"login":"cirosantilli","id":1429315,"avatar_url":"https://avatars.githubusercontent.com/u/1429315?v=3","gravatar_id":"","url":"https://api.github.com/users/cirosantilli","html_url":"https://github.com/cirosantilli","followers_url":"https://api.github.com/users/cirosantilli/followers","following_url":"https://api.github.com/users/cirosantilli/following{/other_user}","gists_url":"https://api.github.com/users/cirosantilli/gists{/gist_id}","starred_url":"https://api.github.com/users/cirosantilli/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cirosantilli/subscriptions","organizations_url":"https://api.github.com/users/cirosantilli/orgs","repos_url":"https://api.github.com/users/cirosantilli/repos","events_url":"https://api.github.com/users/cirosantilli/events{/privacy}","received_events_url":"https://api.github.com/users/cirosantilli/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":4,"created_at":"2014-05-30T08:58:58Z","updated_at":"2015-10-30T19:00:34Z","closed_at":null,"body":"If GitHub wants to be usable by non-programmers, this is a must.\r\n\r\nI want this to help non-programmers to write books on GitHub as in https://github.com/booktree/booktree\r\n\r\nSeems possible with the GitHub client: https://help.github.com/articles/resolving-merge-conflicts , but this should be doable from the web UI: requiring people to download things is a huge turn off.\r\n\r\nPossible implementation: a per file ours / theirs / actual view like Penflip does:\r\n\r\n![sync cirosantilli1 version penflip](https://cloud.githubusercontent.com/assets/1429315/3128629/1f0d8af4-e7d7-11e3-973d-f9892d9ff252.png)\r\n\r\nGitLab accepting pull requests: http://feedback.gitlab.com/forums/176466-general/suggestions/5590496-resolve-any-merge-request-conflict-from-the-web-in\r\n\r\nI'm considering a Javascript interface that interacts through the API to do that. Does such thing exist already?"},"comment":{"url":"https://api.github.com/repos/isaacs/github/issues/comments/152618166","html_url":"https://github.com/isaacs/github/issues/200#issuecomment-152618166","issue_url":"https://api.github.com/repos/isaacs/github/issues/200","id":152618166,"user":{"login":"cirosantilli","id":1429315,"avatar_url":"https://avatars.githubusercontent.com/u/1429315?v=3","gravatar_id":"","url":"https://api.github.com/users/cirosantilli","html_url":"https://github.com/cirosantilli","followers_url":"https://api.github.com/users/cirosantilli/followers","following_url":"https://api.github.com/users/cirosantilli/following{/other_user}","gists_url":"https://api.github.com/users/cirosantilli/gists{/gist_id}","starred_url":"https://api.github.com/users/cirosantilli/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cirosantilli/subscriptions","organizations_url":"https://api.github.com/users/cirosantilli/orgs","repos_url":"https://api.github.com/users/cirosantilli/repos","events_url":"https://api.github.com/users/cirosantilli/events{/privacy}","received_events_url":"https://api.github.com/users/cirosantilli/received_events","type":"User","site_admin":false},"created_at":"2015-10-30T19:00:34Z","updated_at":"2015-10-30T19:00:34Z","body":"@gbinal exactly why I attempted this on the first place: https://github.com/booktree/booktree What is your use case? If you have a lot to say about it, let's move to: https://github.com/cirosantilli/chat/issues"}}