{"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":[{"id":374514539,"node_id":"MDU6TGFiZWwzNzQ1MTQ1Mzk=","url":"https://api.github.com/repos/desktop/desktop/labels/enhancement","name":"enhancement","color":"84b6eb","default":true}],"state":"open","locked":false,"assignee":{"login":"outofambit","id":964912,"node_id":"MDQ6VXNlcjk2NDkxMg==","avatar_url":"https://avatars3.githubusercontent.com/u/964912?v=4","gravatar_id":"","url":"https://api.github.com/users/outofambit","html_url":"https://github.com/outofambit","followers_url":"https://api.github.com/users/outofambit/followers","following_url":"https://api.github.com/users/outofambit/following{/other_user}","gists_url":"https://api.github.com/users/outofambit/gists{/gist_id}","starred_url":"https://api.github.com/users/outofambit/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/outofambit/subscriptions","organizations_url":"https://api.github.com/users/outofambit/orgs","repos_url":"https://api.github.com/users/outofambit/repos","events_url":"https://api.github.com/users/outofambit/events{/privacy}","received_events_url":"https://api.github.com/users/outofambit/received_events","type":"User","site_admin":true},"assignees":[{"login":"outofambit","id":964912,"node_id":"MDQ6VXNlcjk2NDkxMg==","avatar_url":"https://avatars3.githubusercontent.com/u/964912?v=4","gravatar_id":"","url":"https://api.github.com/users/outofambit","html_url":"https://github.com/outofambit","followers_url":"https://api.github.com/users/outofambit/followers","following_url":"https://api.github.com/users/outofambit/following{/other_user}","gists_url":"https://api.github.com/users/outofambit/gists{/gist_id}","starred_url":"https://api.github.com/users/outofambit/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/outofambit/subscriptions","organizations_url":"https://api.github.com/users/outofambit/orgs","repos_url":"https://api.github.com/users/outofambit/repos","events_url":"https://api.github.com/users/outofambit/events{/privacy}","received_events_url":"https://api.github.com/users/outofambit/received_events","type":"User","site_admin":true}],"milestone":{"url":"https://api.github.com/repos/desktop/desktop/milestones/29","html_url":"https://github.com/desktop/desktop/milestone/29","labels_url":"https://api.github.com/repos/desktop/desktop/milestones/29/labels","id":3785921,"node_id":"MDk6TWlsZXN0b25lMzc4NTkyMQ==","number":29,"title":"1.5.1","description":"Bug fixes and improvements post 1.5\r\n\r\nBeta: 12/5\r\nBeta: 12/12","creator":{"login":"shiftkey","id":359239,"node_id":"MDQ6VXNlcjM1OTIzOQ==","avatar_url":"https://avatars2.githubusercontent.com/u/359239?v=4","gravatar_id":"","url":"https://api.github.com/users/shiftkey","html_url":"https://github.com/shiftkey","followers_url":"https://api.github.com/users/shiftkey/followers","following_url":"https://api.github.com/users/shiftkey/following{/other_user}","gists_url":"https://api.github.com/users/shiftkey/gists{/gist_id}","starred_url":"https://api.github.com/users/shiftkey/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shiftkey/subscriptions","organizations_url":"https://api.github.com/users/shiftkey/orgs","repos_url":"https://api.github.com/users/shiftkey/repos","events_url":"https://api.github.com/users/shiftkey/events{/privacy}","received_events_url":"https://api.github.com/users/shiftkey/received_events","type":"User","site_admin":true},"open_issues":4,"closed_issues":67,"state":"open","created_at":"2018-10-31T16:12:22Z","updated_at":"2018-12-18T16:27:15Z","due_on":"2018-12-19T08:00:00Z","closed_at":null},"comments":57,"created_at":"2018-11-16T10:50:01Z","updated_at":"2018-12-18T18:13:37Z","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/448316768","html_url":"https://github.com/desktop/desktop/issues/6213#issuecomment-448316768","issue_url":"https://api.github.com/repos/desktop/desktop/issues/6213","id":448316768,"node_id":"MDEyOklzc3VlQ29tbWVudDQ0ODMxNjc2OA==","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-12-18T18:13:37Z","updated_at":"2018-12-18T18:13:37Z","author_association":"CONTRIBUTOR","body":"Hi @Swarzkopf314, thanks for the updated response. Prior to the last release, we did usability testing with several people and everyone indicated that closing the modal or getting back to the diff added an extra level of complexity that didn't feel necessary. However, we understand after the feedback we've received here that there are some percentage of people who prefer to more manual workflow during conflict resolution for a variety of reasons. We know when we release things that each individual thing isn't going to be perfect, but that's why we listen to feedback, try to unpack the underlying problems, and iterate from there.\r\n\r\nWith respect to magic stashing, I totally understand the frustration having used the previous Mac app and liking that feature. As you saw, we're working on that in #6107 and it's on the roadmap for the next few big things we're working on. Because the current app was entirely new from the previous apps and only the Mac app had magic stashing (and it was relatively unreliable and sometimes got people into bad spots), we decided to prioritize other things. But we do think it's important and we are starting to work on it. Appreciate the feedback and hope this helps explain our process a bit more."}}
{"actor":{"display_login":"billygriffin"}}