{"action":"created","issue":{"url":"https://api.github.com/repos/desktop/desktop/issues/6213","repository_url":"https://api.github.com/repos/desktop/desktop","labels_url":"https://api.github.com/repos/desktop/desktop/issues/6213/labels{/name}","comments_url":"https://api.github.com/repos/desktop/desktop/issues/6213/comments","events_url":"https://api.github.com/repos/desktop/desktop/issues/6213/events","html_url":"https://github.com/desktop/desktop/issues/6213","id":381547658,"node_id":"MDU6SXNzdWUzODE1NDc2NTg=","number":6213,"title":"Cannot see all conflicts","user":{"login":"decabeza","id":631897,"node_id":"MDQ6VXNlcjYzMTg5Nw==","avatar_url":"https://avatars0.githubusercontent.com/u/631897?v=4","gravatar_id":"","url":"https://api.github.com/users/decabeza","html_url":"https://github.com/decabeza","followers_url":"https://api.github.com/users/decabeza/followers","following_url":"https://api.github.com/users/decabeza/following{/other_user}","gists_url":"https://api.github.com/users/decabeza/gists{/gist_id}","starred_url":"https://api.github.com/users/decabeza/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/decabeza/subscriptions","organizations_url":"https://api.github.com/users/decabeza/orgs","repos_url":"https://api.github.com/users/decabeza/repos","events_url":"https://api.github.com/users/decabeza/events{/privacy}","received_events_url":"https://api.github.com/users/decabeza/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":11,"created_at":"2018-11-16T10:50:01Z","updated_at":"2018-11-19T22:36:13Z","closed_at":null,"author_association":"NONE","body":"**Please describe the problem you think should be solved**\r\nWhen you merge a branch with conflicts in previous version you could check all files with conflicts. Now appears a no closable popup with the list of all conflicted files and you have to open one by one on text editor instead of see them on Github Desktop. \r\n\r\nExample:\r\n\r\n![conflicts](https://user-images.githubusercontent.com/631897/48616935-5299a500-e995-11e8-96f7-aa5315be5ade.png)\r\n\r\nAlso when you resolve all the conflicts you can't review all changed files before merge 😅 \r\n\r\n<img width=\"539\" alt=\"merge\" src=\"https://user-images.githubusercontent.com/631897/48623080-fe98bb80-e9a8-11e8-901d-f53ef2878de7.png\">\r\n\r\n<img width=\"534\" alt=\"merge\" src=\"https://user-images.githubusercontent.com/631897/48624105-dfe7f400-e9ab-11e8-88e5-cb6b9b77b85b.png\">\r\n\r\n**Do you have any potential solutions in mind?**\r\nI think this popup should have a close button to hide it an can check all files (as before) without have to open one by one."},"comment":{"url":"https://api.github.com/repos/desktop/desktop/issues/comments/440067148","html_url":"https://github.com/desktop/desktop/issues/6213#issuecomment-440067148","issue_url":"https://api.github.com/repos/desktop/desktop/issues/6213","id":440067148,"node_id":"MDEyOklzc3VlQ29tbWVudDQ0MDA2NzE0OA==","user":{"login":"billygriffin","id":5091167,"node_id":"MDQ6VXNlcjUwOTExNjc=","avatar_url":"https://avatars1.githubusercontent.com/u/5091167?v=4","gravatar_id":"","url":"https://api.github.com/users/billygriffin","html_url":"https://github.com/billygriffin","followers_url":"https://api.github.com/users/billygriffin/followers","following_url":"https://api.github.com/users/billygriffin/following{/other_user}","gists_url":"https://api.github.com/users/billygriffin/gists{/gist_id}","starred_url":"https://api.github.com/users/billygriffin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/billygriffin/subscriptions","organizations_url":"https://api.github.com/users/billygriffin/orgs","repos_url":"https://api.github.com/users/billygriffin/repos","events_url":"https://api.github.com/users/billygriffin/events{/privacy}","received_events_url":"https://api.github.com/users/billygriffin/received_events","type":"User","site_admin":true},"created_at":"2018-11-19T22:36:13Z","updated_at":"2018-11-19T22:36:13Z","author_association":"CONTRIBUTOR","body":"Thanks @ampinsk, looks really nice and hopefully helps to give people an escape hatch if they want to see the diff and/or the additional files that were not conflicted. And it's nice that they can easily get back to it. \r\n\r\nA couple considerations in implementation: \r\n- [ ] is that we'll need to make sure the title stops before the close button, and that you can tab to it for accessibility.\r\n- [ ] If we do go this direction, I'd also like to instrument metrics to find out what % of time people are closing the dialog, and also how frequently people are reopening it. If we implement something like this and a trivially small portion of people are closing the dialog, maybe we re-evaluate. And if a large portion of people are closing it, maybe we reconsider our original happy-path implementation."}}
{"actor":{"display_login":"billygriffin"}}