{"action":"created","comment":{"url":"https://api.github.com/repos/desktop/desktop/pulls/comments/228265299","pull_request_review_id":168498964,"id":228265299,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIyODI2NTI5OQ==","diff_hunk":"@@ -17,7 +17,7 @@\n \n     &:after {\n       display: block;\n-      border-bottom: var(--base-border);\n+      border-bottom: 0;","path":"app/styles/ui/_merge-status.scss","position":5,"original_position":5,"commit_id":"8edfb2267730513672831eb6184b99204db613e8","original_commit_id":"8edfb2267730513672831eb6184b99204db613e8","user":{"login":"ampinsk","id":10404068,"node_id":"MDQ6VXNlcjEwNDA0MDY4","avatar_url":"https://avatars3.githubusercontent.com/u/10404068?v=4","gravatar_id":"","url":"https://api.github.com/users/ampinsk","html_url":"https://github.com/ampinsk","followers_url":"https://api.github.com/users/ampinsk/followers","following_url":"https://api.github.com/users/ampinsk/following{/other_user}","gists_url":"https://api.github.com/users/ampinsk/gists{/gist_id}","starred_url":"https://api.github.com/users/ampinsk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ampinsk/subscriptions","organizations_url":"https://api.github.com/users/ampinsk/orgs","repos_url":"https://api.github.com/users/ampinsk/repos","events_url":"https://api.github.com/users/ampinsk/events{/privacy}","received_events_url":"https://api.github.com/users/ampinsk/received_events","type":"User","site_admin":true},"body":"We still need the horizontal rule here so it shows up in the comparison panel 😄 \r\n\r\n```suggestion\r\n      border-bottom: var(--base-border);\r\n```","created_at":"2018-10-25T17:28:56Z","updated_at":"2018-10-25T17:28:56Z","html_url":"https://github.com/desktop/desktop/pull/5957#discussion_r228265299","pull_request_url":"https://api.github.com/repos/desktop/desktop/pulls/5957","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/desktop/desktop/pulls/comments/228265299"},"html":{"href":"https://github.com/desktop/desktop/pull/5957#discussion_r228265299"},"pull_request":{"href":"https://api.github.com/repos/desktop/desktop/pulls/5957"}}},"pull_request":{"url":"https://api.github.com/repos/desktop/desktop/pulls/5957","id":224449484,"node_id":"MDExOlB1bGxSZXF1ZXN0MjI0NDQ5NDg0","html_url":"https://github.com/desktop/desktop/pull/5957","diff_url":"https://github.com/desktop/desktop/pull/5957.diff","patch_url":"https://github.com/desktop/desktop/pull/5957.patch","issue_url":"https://api.github.com/repos/desktop/desktop/issues/5957","number":5957,"state":"open","locked":false,"title":"Improve merge dialog by making merge direction clearer","user":{"login":"JQuinnie","id":29465981,"node_id":"MDQ6VXNlcjI5NDY1OTgx","avatar_url":"https://avatars0.githubusercontent.com/u/29465981?v=4","gravatar_id":"","url":"https://api.github.com/users/JQuinnie","html_url":"https://github.com/JQuinnie","followers_url":"https://api.github.com/users/JQuinnie/followers","following_url":"https://api.github.com/users/JQuinnie/following{/other_user}","gists_url":"https://api.github.com/users/JQuinnie/gists{/gist_id}","starred_url":"https://api.github.com/users/JQuinnie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JQuinnie/subscriptions","organizations_url":"https://api.github.com/users/JQuinnie/orgs","repos_url":"https://api.github.com/users/JQuinnie/repos","events_url":"https://api.github.com/users/JQuinnie/events{/privacy}","received_events_url":"https://api.github.com/users/JQuinnie/received_events","type":"User","site_admin":false},"body":"This PR fixes #5930 with context below;\r\n\r\n> The directional merge flow is not as obvious as it could be. It should be perfectly clear which branch you're merging into which branch.\r\n\r\nTwo changes were made to make it more obvious as to which branch (_selected branch_) is getting merged into what (_current branch_);\r\n1. Updated the merge text dialog to include selected branch merge into current branch.\r\n2. Moved the merge text dialog above the **Merge** button.\r\n\r\n**Before the Change**\r\n<img width=\"400\" alt=\"issue5930-before-merge\" src=\"https://user-images.githubusercontent.com/29465981/47250877-20714380-d3e7-11e8-8d94-2062a2472a20.png\">\r\n<img width=\"400\" alt=\"issue5930-before-conflict\" src=\"https://user-images.githubusercontent.com/29465981/47250884-4991d400-d3e7-11e8-84eb-2de230ca8098.png\">\r\n\r\n**After the Change**\r\n<img width=\"400\" alt=\"screen shot 2018-10-24 at 8 29 16 pm\" src=\"https://user-images.githubusercontent.com/29465981/47473133-9a7e3f80-d7ce-11e8-9ca7-f01e322047f1.png\">\r\n<img width=\"400\" alt=\"screen shot 2018-10-24 at 8 29 32 pm\" src=\"https://user-images.githubusercontent.com/29465981/47473145-a0742080-d7ce-11e8-844a-ac7090c99beb.png\">\r\n\r\n\r\nNOTES:\r\n- As for the **RISK** mentioned in #5930 , separate PR #5982 pulls this and issue #5970 in.\r\n","created_at":"2018-10-20T03:48:57Z","updated_at":"2018-10-25T17:28:56Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5e7884609b8bd5b67a78ecc6b5327bb197a4068d","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}],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":590997902,"node_id":"MDU6TGFiZWw1OTA5OTc5MDI=","url":"https://api.github.com/repos/desktop/desktop/labels/ready-for-review","name":"ready-for-review","color":"0e8a16","default":false}],"milestone":{"url":"https://api.github.com/repos/desktop/desktop/milestones/24","html_url":"https://github.com/desktop/desktop/milestone/24","labels_url":"https://api.github.com/repos/desktop/desktop/milestones/24/labels","id":3631204,"node_id":"MDk6TWlsZXN0b25lMzYzMTIwNA==","number":24,"title":"1.5.0","description":"","creator":{"login":"nerdneha","id":1834387,"node_id":"MDQ6VXNlcjE4MzQzODc=","avatar_url":"https://avatars0.githubusercontent.com/u/1834387?v=4","gravatar_id":"","url":"https://api.github.com/users/nerdneha","html_url":"https://github.com/nerdneha","followers_url":"https://api.github.com/users/nerdneha/followers","following_url":"https://api.github.com/users/nerdneha/following{/other_user}","gists_url":"https://api.github.com/users/nerdneha/gists{/gist_id}","starred_url":"https://api.github.com/users/nerdneha/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nerdneha/subscriptions","organizations_url":"https://api.github.com/users/nerdneha/orgs","repos_url":"https://api.github.com/users/nerdneha/repos","events_url":"https://api.github.com/users/nerdneha/events{/privacy}","received_events_url":"https://api.github.com/users/nerdneha/received_events","type":"User","site_admin":true},"open_issues":10,"closed_issues":19,"state":"open","created_at":"2018-09-07T04:14:01Z","updated_at":"2018-10-25T16:51:49Z","due_on":"2018-11-06T08:00:00Z","closed_at":null},"commits_url":"https://api.github.com/repos/desktop/desktop/pulls/5957/commits","review_comments_url":"https://api.github.com/repos/desktop/desktop/pulls/5957/comments","review_comment_url":"https://api.github.com/repos/desktop/desktop/pulls/comments{/number}","comments_url":"https://api.github.com/repos/desktop/desktop/issues/5957/comments","statuses_url":"https://api.github.com/repos/desktop/desktop/statuses/8edfb2267730513672831eb6184b99204db613e8","head":{"label":"JQuinnie:branch-merge-dialogs","ref":"branch-merge-dialogs","sha":"8edfb2267730513672831eb6184b99204db613e8","user":{"login":"JQuinnie","id":29465981,"node_id":"MDQ6VXNlcjI5NDY1OTgx","avatar_url":"https://avatars0.githubusercontent.com/u/29465981?v=4","gravatar_id":"","url":"https://api.github.com/users/JQuinnie","html_url":"https://github.com/JQuinnie","followers_url":"https://api.github.com/users/JQuinnie/followers","following_url":"https://api.github.com/users/JQuinnie/following{/other_user}","gists_url":"https://api.github.com/users/JQuinnie/gists{/gist_id}","starred_url":"https://api.github.com/users/JQuinnie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JQuinnie/subscriptions","organizations_url":"https://api.github.com/users/JQuinnie/orgs","repos_url":"https://api.github.com/users/JQuinnie/repos","events_url":"https://api.github.com/users/JQuinnie/events{/privacy}","received_events_url":"https://api.github.com/users/JQuinnie/received_events","type":"User","site_admin":false},"repo":{"id":117294728,"node_id":"MDEwOlJlcG9zaXRvcnkxMTcyOTQ3Mjg=","name":"desktop","full_name":"JQuinnie/desktop","private":false,"owner":{"login":"JQuinnie","id":29465981,"node_id":"MDQ6VXNlcjI5NDY1OTgx","avatar_url":"https://avatars0.githubusercontent.com/u/29465981?v=4","gravatar_id":"","url":"https://api.github.com/users/JQuinnie","html_url":"https://github.com/JQuinnie","followers_url":"https://api.github.com/users/JQuinnie/followers","following_url":"https://api.github.com/users/JQuinnie/following{/other_user}","gists_url":"https://api.github.com/users/JQuinnie/gists{/gist_id}","starred_url":"https://api.github.com/users/JQuinnie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JQuinnie/subscriptions","organizations_url":"https://api.github.com/users/JQuinnie/orgs","repos_url":"https://api.github.com/users/JQuinnie/repos","events_url":"https://api.github.com/users/JQuinnie/events{/privacy}","received_events_url":"https://api.github.com/users/JQuinnie/received_events","type":"User","site_admin":false},"html_url":"https://github.com/JQuinnie/desktop","description":"Simple collaboration from your desktop","fork":true,"url":"https://api.github.com/repos/JQuinnie/desktop","forks_url":"https://api.github.com/repos/JQuinnie/desktop/forks","keys_url":"https://api.github.com/repos/JQuinnie/desktop/keys{/key_id}","collaborators_url":"https://api.github.com/repos/JQuinnie/desktop/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/JQuinnie/desktop/teams","hooks_url":"https://api.github.com/repos/JQuinnie/desktop/hooks","issue_events_url":"https://api.github.com/repos/JQuinnie/desktop/issues/events{/number}","events_url":"https://api.github.com/repos/JQuinnie/desktop/events","assignees_url":"https://api.github.com/repos/JQuinnie/desktop/assignees{/user}","branches_url":"https://api.github.com/repos/JQuinnie/desktop/branches{/branch}","tags_url":"https://api.github.com/repos/JQuinnie/desktop/tags","blobs_url":"https://api.github.com/repos/JQuinnie/desktop/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/JQuinnie/desktop/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/JQuinnie/desktop/git/refs{/sha}","trees_url":"https://api.github.com/repos/JQuinnie/desktop/git/trees{/sha}","statuses_url":"https://api.github.com/repos/JQuinnie/desktop/statuses/{sha}","languages_url":"https://api.github.com/repos/JQuinnie/desktop/languages","stargazers_url":"https://api.github.com/repos/JQuinnie/desktop/stargazers","contributors_url":"https://api.github.com/repos/JQuinnie/desktop/contributors","subscribers_url":"https://api.github.com/repos/JQuinnie/desktop/subscribers","subscription_url":"https://api.github.com/repos/JQuinnie/desktop/subscription","commits_url":"https://api.github.com/repos/JQuinnie/desktop/commits{/sha}","git_commits_url":"https://api.github.com/repos/JQuinnie/desktop/git/commits{/sha}","comments_url":"https://api.github.com/repos/JQuinnie/desktop/comments{/number}","issue_comment_url":"https://api.github.com/repos/JQuinnie/desktop/issues/comments{/number}","contents_url":"https://api.github.com/repos/JQuinnie/desktop/contents/{+path}","compare_url":"https://api.github.com/repos/JQuinnie/desktop/compare/{base}...{head}","merges_url":"https://api.github.com/repos/JQuinnie/desktop/merges","archive_url":"https://api.github.com/repos/JQuinnie/desktop/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/JQuinnie/desktop/downloads","issues_url":"https://api.github.com/repos/JQuinnie/desktop/issues{/number}","pulls_url":"https://api.github.com/repos/JQuinnie/desktop/pulls{/number}","milestones_url":"https://api.github.com/repos/JQuinnie/desktop/milestones{/number}","notifications_url":"https://api.github.com/repos/JQuinnie/desktop/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/JQuinnie/desktop/labels{/name}","releases_url":"https://api.github.com/repos/JQuinnie/desktop/releases{/id}","deployments_url":"https://api.github.com/repos/JQuinnie/desktop/deployments","created_at":"2018-01-12T22:41:51Z","updated_at":"2018-10-20T18:37:23Z","pushed_at":"2018-10-25T02:40:30Z","git_url":"git://github.com/JQuinnie/desktop.git","ssh_url":"git@github.com:JQuinnie/desktop.git","clone_url":"https://github.com/JQuinnie/desktop.git","svn_url":"https://github.com/JQuinnie/desktop","homepage":"https://desktop.github.com","size":34390,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"desktop:master","ref":"master","sha":"70ef65bfb9c47f0037047c88bc43ac86bf778588","user":{"login":"desktop","id":13171334,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEzMTcxMzM0","avatar_url":"https://avatars0.githubusercontent.com/u/13171334?v=4","gravatar_id":"","url":"https://api.github.com/users/desktop","html_url":"https://github.com/desktop","followers_url":"https://api.github.com/users/desktop/followers","following_url":"https://api.github.com/users/desktop/following{/other_user}","gists_url":"https://api.github.com/users/desktop/gists{/gist_id}","starred_url":"https://api.github.com/users/desktop/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/desktop/subscriptions","organizations_url":"https://api.github.com/users/desktop/orgs","repos_url":"https://api.github.com/users/desktop/repos","events_url":"https://api.github.com/users/desktop/events{/privacy}","received_events_url":"https://api.github.com/users/desktop/received_events","type":"Organization","site_admin":false},"repo":{"id":58559694,"node_id":"MDEwOlJlcG9zaXRvcnk1ODU1OTY5NA==","name":"desktop","full_name":"desktop/desktop","private":false,"owner":{"login":"desktop","id":13171334,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEzMTcxMzM0","avatar_url":"https://avatars0.githubusercontent.com/u/13171334?v=4","gravatar_id":"","url":"https://api.github.com/users/desktop","html_url":"https://github.com/desktop","followers_url":"https://api.github.com/users/desktop/followers","following_url":"https://api.github.com/users/desktop/following{/other_user}","gists_url":"https://api.github.com/users/desktop/gists{/gist_id}","starred_url":"https://api.github.com/users/desktop/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/desktop/subscriptions","organizations_url":"https://api.github.com/users/desktop/orgs","repos_url":"https://api.github.com/users/desktop/repos","events_url":"https://api.github.com/users/desktop/events{/privacy}","received_events_url":"https://api.github.com/users/desktop/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/desktop/desktop","description":"Simple collaboration from your desktop","fork":false,"url":"https://api.github.com/repos/desktop/desktop","forks_url":"https://api.github.com/repos/desktop/desktop/forks","keys_url":"https://api.github.com/repos/desktop/desktop/keys{/key_id}","collaborators_url":"https://api.github.com/repos/desktop/desktop/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/desktop/desktop/teams","hooks_url":"https://api.github.com/repos/desktop/desktop/hooks","issue_events_url":"https://api.github.com/repos/desktop/desktop/issues/events{/number}","events_url":"https://api.github.com/repos/desktop/desktop/events","assignees_url":"https://api.github.com/repos/desktop/desktop/assignees{/user}","branches_url":"https://api.github.com/repos/desktop/desktop/branches{/branch}","tags_url":"https://api.github.com/repos/desktop/desktop/tags","blobs_url":"https://api.github.com/repos/desktop/desktop/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/desktop/desktop/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/desktop/desktop/git/refs{/sha}","trees_url":"https://api.github.com/repos/desktop/desktop/git/trees{/sha}","statuses_url":"https://api.github.com/repos/desktop/desktop/statuses/{sha}","languages_url":"https://api.github.com/repos/desktop/desktop/languages","stargazers_url":"https://api.github.com/repos/desktop/desktop/stargazers","contributors_url":"https://api.github.com/repos/desktop/desktop/contributors","subscribers_url":"https://api.github.com/repos/desktop/desktop/subscribers","subscription_url":"https://api.github.com/repos/desktop/desktop/subscription","commits_url":"https://api.github.com/repos/desktop/desktop/commits{/sha}","git_commits_url":"https://api.github.com/repos/desktop/desktop/git/commits{/sha}","comments_url":"https://api.github.com/repos/desktop/desktop/comments{/number}","issue_comment_url":"https://api.github.com/repos/desktop/desktop/issues/comments{/number}","contents_url":"https://api.github.com/repos/desktop/desktop/contents/{+path}","compare_url":"https://api.github.com/repos/desktop/desktop/compare/{base}...{head}","merges_url":"https://api.github.com/repos/desktop/desktop/merges","archive_url":"https://api.github.com/repos/desktop/desktop/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/desktop/desktop/downloads","issues_url":"https://api.github.com/repos/desktop/desktop/issues{/number}","pulls_url":"https://api.github.com/repos/desktop/desktop/pulls{/number}","milestones_url":"https://api.github.com/repos/desktop/desktop/milestones{/number}","notifications_url":"https://api.github.com/repos/desktop/desktop/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/desktop/desktop/labels{/name}","releases_url":"https://api.github.com/repos/desktop/desktop/releases{/id}","deployments_url":"https://api.github.com/repos/desktop/desktop/deployments","created_at":"2016-05-11T15:59:00Z","updated_at":"2018-10-25T16:51:57Z","pushed_at":"2018-10-25T17:00:31Z","git_url":"git://github.com/desktop/desktop.git","ssh_url":"git@github.com:desktop/desktop.git","clone_url":"https://github.com/desktop/desktop.git","svn_url":"https://github.com/desktop/desktop","homepage":"https://desktop.github.com","size":35468,"stargazers_count":6110,"watchers_count":6110,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":2627,"mirror_url":null,"archived":false,"open_issues_count":460,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":2627,"open_issues":460,"watchers":6110,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/desktop/desktop/pulls/5957"},"html":{"href":"https://github.com/desktop/desktop/pull/5957"},"issue":{"href":"https://api.github.com/repos/desktop/desktop/issues/5957"},"comments":{"href":"https://api.github.com/repos/desktop/desktop/issues/5957/comments"},"review_comments":{"href":"https://api.github.com/repos/desktop/desktop/pulls/5957/comments"},"review_comment":{"href":"https://api.github.com/repos/desktop/desktop/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/desktop/desktop/pulls/5957/commits"},"statuses":{"href":"https://api.github.com/repos/desktop/desktop/statuses/8edfb2267730513672831eb6184b99204db613e8"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"ampinsk"}}