{"action":"created","issue":{"url":"https://api.github.com/repos/desktop/desktop/issues/6429","repository_url":"https://api.github.com/repos/desktop/desktop","labels_url":"https://api.github.com/repos/desktop/desktop/issues/6429/labels{/name}","comments_url":"https://api.github.com/repos/desktop/desktop/issues/6429/comments","events_url":"https://api.github.com/repos/desktop/desktop/issues/6429/events","html_url":"https://github.com/desktop/desktop/issues/6429","id":391347420,"node_id":"MDU6SXNzdWUzOTEzNDc0MjA=","number":6429,"title":"merge conflicts state allows to keep making more merges?","user":{"login":"msftrncs","id":26179051,"node_id":"MDQ6VXNlcjI2MTc5MDUx","avatar_url":"https://avatars3.githubusercontent.com/u/26179051?v=4","gravatar_id":"","url":"https://api.github.com/users/msftrncs","html_url":"https://github.com/msftrncs","followers_url":"https://api.github.com/users/msftrncs/followers","following_url":"https://api.github.com/users/msftrncs/following{/other_user}","gists_url":"https://api.github.com/users/msftrncs/gists{/gist_id}","starred_url":"https://api.github.com/users/msftrncs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/msftrncs/subscriptions","organizations_url":"https://api.github.com/users/msftrncs/orgs","repos_url":"https://api.github.com/users/msftrncs/repos","events_url":"https://api.github.com/users/msftrncs/events{/privacy}","received_events_url":"https://api.github.com/users/msftrncs/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-12-15T05:49:04Z","updated_at":"2018-12-17T13:51:41Z","closed_at":null,"author_association":"CONTRIBUTOR","body":"## Description\r\nClosing the guided conflicts modal reveals that additional merges (or even the same merge again) can be attempted, but results in GIT errors.  I suspect that undo or revert could be bad ideas at this time too.  Error messages are given (hinting conflicts need resolved first), and nothing bad seems to happen.\r\n\r\nUNDO could be worse, as it just automatically merges the undo in to your working tree, with the conflict banner remaining on screen, but no conflicts present (via icons) though the original conflicted file remains as if it were conflicted.  (see below)\r\n\r\n## Version\r\n* GitHub Desktop: 1.5.1-beta5 (but self-built using Node 10)\r\n* Operating system: Win 10 18298 preview\r\n\r\n## Steps to Reproduce\r\n1. close the merge conflict modal\r\n2. attempt another merge because all the merge buttons are still enabled.\r\n\r\n### Expected Behavior\r\nI might expect only finishing or aborting the current merge would be possible, or that doing some things should bring up the 'abort conflicted merge' flow (confirmation that is really want you want to do, then unwind the conflicted merge) before continuing.\r\n\r\n### Actual Behavior\r\nThe merge buttons attempt to merge more changes, or even the same changes again, but results in GIT errors.\r\n\r\n## Additional Information\r\nKeep in mind that my understanding of conflict resolution is limited as I have not dealt a lot with it.  I was testing the latest beta since it added the 'close guided conflict modal' feature.\r\n\r\nmerge button enabled for the exact same merge I just attempted that I am still in conflict resolution for.\r\n![image](https://user-images.githubusercontent.com/26179051/50039210-af6b9800-fff3-11e8-905f-bab2a6425aa2.png)\r\n\r\nMerge conflict markers not treated special, is it not supposed to be?\r\n![image](https://user-images.githubusercontent.com/26179051/50039143-9a423980-fff2-11e8-8bc6-3724938caeb1.png)\r\n\r\nAfter pressing 'undo'...   yikes, how am I going to fix this?  (good its just a sandbox!)\r\nThe conflict banner went away when I closed Desktop and reopened it, and the guided conflict modal did not reopen either.\r\n![image](https://user-images.githubusercontent.com/26179051/50039320-33268400-fff6-11e8-9fd7-488983303571.png)\r\n\r\n"},"comment":{"url":"https://api.github.com/repos/desktop/desktop/issues/comments/447852516","html_url":"https://github.com/desktop/desktop/issues/6429#issuecomment-447852516","issue_url":"https://api.github.com/repos/desktop/desktop/issues/6429","id":447852516,"node_id":"MDEyOklzc3VlQ29tbWVudDQ0Nzg1MjUxNg==","user":{"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},"created_at":"2018-12-17T13:51:41Z","updated_at":"2018-12-17T13:51:41Z","author_association":"MEMBER","body":"@outofambit @iAmWillShepherd I see you were both involved with #6382 - want to have a read of this and see if it's something you're aware of?"}}
{"actor":{"display_login":"shiftkey"}}