payload: {"action":"created","issue":{"url":"https://api.github.com/repos/craftercms/craftercms/issues/3359","repository_url":"https://api.github.com/repos/craftercms/craftercms","labels_url":"https://api.github.com/repos/craftercms/craftercms/issues/3359/labels{/name}","comments_url":"https://api.github.com/repos/craftercms/craftercms/issues/3359/comments","events_url":"https://api.github.com/repos/craftercms/craftercms/issues/3359/events","html_url":"https://github.com/craftercms/craftercms/issues/3359","id":479122996,"node_id":"MDU6SXNzdWU0NzkxMjI5OTY=","number":3359,"title":"[studio-ui] Create a UI for conflict resolution within Studio","user":{"login":"rart","id":3928341,"node_id":"MDQ6VXNlcjM5MjgzNDE=","avatar_url":"https://avatars0.githubusercontent.com/u/3928341?v=4","gravatar_id":"","url":"https://api.github.com/users/rart","html_url":"https://github.com/rart","followers_url":"https://api.github.com/users/rart/followers","following_url":"https://api.github.com/users/rart/following{/other_user}","gists_url":"https://api.github.com/users/rart/gists{/gist_id}","starred_url":"https://api.github.com/users/rart/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rart/subscriptions","organizations_url":"https://api.github.com/users/rart/orgs","repos_url":"https://api.github.com/users/rart/repos","events_url":"https://api.github.com/users/rart/events{/privacy}","received_events_url":"https://api.github.com/users/rart/received_events","type":"User","site_admin":false},"labels":[{"id":474774758,"node_id":"MDU6TGFiZWw0NzQ3NzQ3NTg=","url":"https://api.github.com/repos/craftercms/craftercms/labels/new%20feature","name":"new feature","color":"fbca04","default":false},{"id":544813678,"node_id":"MDU6TGFiZWw1NDQ4MTM2Nzg=","url":"https://api.github.com/repos/craftercms/craftercms/labels/priority:%20high","name":"priority: high","color":"d93f0b","default":false}],"state":"open","locked":false,"assignee":{"login":"jvega190","id":18267471,"node_id":"MDQ6VXNlcjE4MjY3NDcx","avatar_url":"https://avatars3.githubusercontent.com/u/18267471?v=4","gravatar_id":"","url":"https://api.github.com/users/jvega190","html_url":"https://github.com/jvega190","followers_url":"https://api.github.com/users/jvega190/followers","following_url":"https://api.github.com/users/jvega190/following{/other_user}","gists_url":"https://api.github.com/users/jvega190/gists{/gist_id}","starred_url":"https://api.github.com/users/jvega190/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jvega190/subscriptions","organizations_url":"https://api.github.com/users/jvega190/orgs","repos_url":"https://api.github.com/users/jvega190/repos","events_url":"https://api.github.com/users/jvega190/events{/privacy}","received_events_url":"https://api.github.com/users/jvega190/received_events","type":"User","site_admin":false},"assignees":[{"login":"jvega190","id":18267471,"node_id":"MDQ6VXNlcjE4MjY3NDcx","avatar_url":"https://avatars3.githubusercontent.com/u/18267471?v=4","gravatar_id":"","url":"https://api.github.com/users/jvega190","html_url":"https://github.com/jvega190","followers_url":"https://api.github.com/users/jvega190/followers","following_url":"https://api.github.com/users/jvega190/following{/other_user}","gists_url":"https://api.github.com/users/jvega190/gists{/gist_id}","starred_url":"https://api.github.com/users/jvega190/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jvega190/subscriptions","organizations_url":"https://api.github.com/users/jvega190/orgs","repos_url":"https://api.github.com/users/jvega190/repos","events_url":"https://api.github.com/users/jvega190/events{/privacy}","received_events_url":"https://api.github.com/users/jvega190/received_events","type":"User","site_admin":false}],"milestone":{"url":"https://api.github.com/repos/craftercms/craftercms/milestones/54","html_url":"https://github.com/craftercms/craftercms/milestone/54","labels_url":"https://api.github.com/repos/craftercms/craftercms/milestones/54/labels","id":4552714,"node_id":"MDk6TWlsZXN0b25lNDU1MjcxNA==","number":54,"title":"Crafter CMS v3.0.25","description":"","creator":{"login":"sumerjabri","id":3931908,"node_id":"MDQ6VXNlcjM5MzE5MDg=","avatar_url":"https://avatars1.githubusercontent.com/u/3931908?v=4","gravatar_id":"","url":"https://api.github.com/users/sumerjabri","html_url":"https://github.com/sumerjabri","followers_url":"https://api.github.com/users/sumerjabri/followers","following_url":"https://api.github.com/users/sumerjabri/following{/other_user}","gists_url":"https://api.github.com/users/sumerjabri/gists{/gist_id}","starred_url":"https://api.github.com/users/sumerjabri/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sumerjabri/subscriptions","organizations_url":"https://api.github.com/users/sumerjabri/orgs","repos_url":"https://api.github.com/users/sumerjabri/repos","events_url":"https://api.github.com/users/sumerjabri/events{/privacy}","received_events_url":"https://api.github.com/users/sumerjabri/received_events","type":"User","site_admin":false},"open_issues":2,"closed_issues":0,"state":"open","created_at":"2019-08-06T17:36:58Z","updated_at":"2019-08-09T18:58:24Z","due_on":"2019-08-16T07:00:00Z","closed_at":null},"comments":0,"created_at":"2019-08-09T18:56:06Z","updated_at":"2019-08-12T14:48:07Z","closed_at":null,"author_association":"MEMBER","body":"**Is your feature request related to a problem? Please describe.**\r\nWhen a pull is performed from studio \"Remote repos\" module and merge conflicts occur, users are not able to solve conflicts from Studio UI.\r\n\r\n**Describe the solution you'd like**\r\nCreate a UI that shows a `git status` summary as it pertains to conflicts that occurred during last pull and allow for resolution from within Studio UI.\r\n\r\n**Describe alternatives you've considered**\r\n<img width=\"2985\" alt=\"conflict-resolution-v3\" src=\"https://user-images.githubusercontent.com/3928341/62802361-ff015580-bae7-11e9-8b56-c571a072d527.png\">\r\n\r\nNote: For release one of this feature, use the stacked split view for the \"Diff\" dialog"},"comment":{"url":"https://api.github.com/repos/craftercms/craftercms/issues/comments/520456482","html_url":"https://github.com/craftercms/craftercms/issues/3359#issuecomment-520456482","issue_url":"https://api.github.com/repos/craftercms/craftercms/issues/3359","id":520456482,"node_id":"MDEyOklzc3VlQ29tbWVudDUyMDQ1NjQ4Mg==","user":{"login":"rart","id":3928341,"node_id":"MDQ6VXNlcjM5MjgzNDE=","avatar_url":"https://avatars0.githubusercontent.com/u/3928341?v=4","gravatar_id":"","url":"https://api.github.com/users/rart","html_url":"https://github.com/rart","followers_url":"https://api.github.com/users/rart/followers","following_url":"https://api.github.com/users/rart/following{/other_user}","gists_url":"https://api.github.com/users/rart/gists{/gist_id}","starred_url":"https://api.github.com/users/rart/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rart/subscriptions","organizations_url":"https://api.github.com/users/rart/orgs","repos_url":"https://api.github.com/users/rart/repos","events_url":"https://api.github.com/users/rart/events{/privacy}","received_events_url":"https://api.github.com/users/rart/received_events","type":"User","site_admin":false},"created_at":"2019-08-12T14:48:07Z","updated_at":"2019-08-12T14:48:07Z","author_association":"MEMBER","body":"**Latest Mockup**\r\n<img width=\"4190\" alt=\"Studio conflict resolution mockups\" src=\"https://user-images.githubusercontent.com/3928341/62874069-d9ab5c00-bd20-11e9-8b75-4f0f4241222a.png\">\r\n"}}
other: {"actor":{"display_login":"rart"}}