{"action":"closed","issue":{"url":"https://api.github.com/repos/Microsoft/vscode/issues/35760","repository_url":"https://api.github.com/repos/Microsoft/vscode","labels_url":"https://api.github.com/repos/Microsoft/vscode/issues/35760/labels{/name}","comments_url":"https://api.github.com/repos/Microsoft/vscode/issues/35760/comments","events_url":"https://api.github.com/repos/Microsoft/vscode/issues/35760/events","html_url":"https://github.com/Microsoft/vscode/issues/35760","id":263536170,"number":35760,"title":"Add built in UI based merge conflict tool","user":{"login":"qwert789","id":1618071,"avatar_url":"https://avatars2.githubusercontent.com/u/1618071?v=4","gravatar_id":"","url":"https://api.github.com/users/qwert789","html_url":"https://github.com/qwert789","followers_url":"https://api.github.com/users/qwert789/followers","following_url":"https://api.github.com/users/qwert789/following{/other_user}","gists_url":"https://api.github.com/users/qwert789/gists{/gist_id}","starred_url":"https://api.github.com/users/qwert789/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/qwert789/subscriptions","organizations_url":"https://api.github.com/users/qwert789/orgs","repos_url":"https://api.github.com/users/qwert789/repos","events_url":"https://api.github.com/users/qwert789/events{/privacy}","received_events_url":"https://api.github.com/users/qwert789/received_events","type":"User","site_admin":false},"labels":[{"id":419891520,"url":"https://api.github.com/repos/Microsoft/vscode/labels/diff-editor","name":"diff-editor","color":"bfd4f2","default":false},{"id":272689392,"url":"https://api.github.com/repos/Microsoft/vscode/labels/feature-request","name":"feature-request","color":"708090","default":false}],"state":"closed","locked":false,"assignee":{"login":"joaomoreno","id":22350,"avatar_url":"https://avatars3.githubusercontent.com/u/22350?v=4","gravatar_id":"","url":"https://api.github.com/users/joaomoreno","html_url":"https://github.com/joaomoreno","followers_url":"https://api.github.com/users/joaomoreno/followers","following_url":"https://api.github.com/users/joaomoreno/following{/other_user}","gists_url":"https://api.github.com/users/joaomoreno/gists{/gist_id}","starred_url":"https://api.github.com/users/joaomoreno/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joaomoreno/subscriptions","organizations_url":"https://api.github.com/users/joaomoreno/orgs","repos_url":"https://api.github.com/users/joaomoreno/repos","events_url":"https://api.github.com/users/joaomoreno/events{/privacy}","received_events_url":"https://api.github.com/users/joaomoreno/received_events","type":"User","site_admin":false},"assignees":[{"login":"joaomoreno","id":22350,"avatar_url":"https://avatars3.githubusercontent.com/u/22350?v=4","gravatar_id":"","url":"https://api.github.com/users/joaomoreno","html_url":"https://github.com/joaomoreno","followers_url":"https://api.github.com/users/joaomoreno/followers","following_url":"https://api.github.com/users/joaomoreno/following{/other_user}","gists_url":"https://api.github.com/users/joaomoreno/gists{/gist_id}","starred_url":"https://api.github.com/users/joaomoreno/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joaomoreno/subscriptions","organizations_url":"https://api.github.com/users/joaomoreno/orgs","repos_url":"https://api.github.com/users/joaomoreno/repos","events_url":"https://api.github.com/users/joaomoreno/events{/privacy}","received_events_url":"https://api.github.com/users/joaomoreno/received_events","type":"User","site_admin":false}],"milestone":{"url":"https://api.github.com/repos/Microsoft/vscode/milestones/8","html_url":"https://github.com/Microsoft/vscode/milestone/8","labels_url":"https://api.github.com/repos/Microsoft/vscode/milestones/8/labels","id":1412124,"number":8,"title":"Backlog","description":"Work not yet planned for a specific release.","creator":{"login":"chrisdias","id":1487073,"avatar_url":"https://avatars0.githubusercontent.com/u/1487073?v=4","gravatar_id":"","url":"https://api.github.com/users/chrisdias","html_url":"https://github.com/chrisdias","followers_url":"https://api.github.com/users/chrisdias/followers","following_url":"https://api.github.com/users/chrisdias/following{/other_user}","gists_url":"https://api.github.com/users/chrisdias/gists{/gist_id}","starred_url":"https://api.github.com/users/chrisdias/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chrisdias/subscriptions","organizations_url":"https://api.github.com/users/chrisdias/orgs","repos_url":"https://api.github.com/users/chrisdias/repos","events_url":"https://api.github.com/users/chrisdias/events{/privacy}","received_events_url":"https://api.github.com/users/chrisdias/received_events","type":"User","site_admin":false},"open_issues":2728,"closed_issues":2389,"state":"open","created_at":"2015-11-15T10:30:19Z","updated_at":"2017-10-09T07:39:14Z","due_on":null,"closed_at":null},"comments":1,"created_at":"2017-10-06T18:40:31Z","updated_at":"2017-10-09T07:39:14Z","closed_at":"2017-10-09T07:39:13Z","author_association":"NONE","body":"Great feature for code and a lot of people would be built in UI based GIT merge conflict tool, which would allow easily to select relevant changes and preview the final result, here some examples:\r\n\r\nGit Kraken example:\r\n![merge-tool-1-copy-1](https://user-images.githubusercontent.com/1618071/31293098-a492b4b0-aade-11e7-829e-c081f4722458.png)\r\n\r\nVisual Studio example:\r\n![vs](https://user-images.githubusercontent.com/1618071/31293135-cbf0ac42-aade-11e7-9cb9-b2cc971cf8b4.png)\r\n\r\n"}}
{"actor":{"display_login":"joaomoreno"}}