{"action":"closed","number":22,"pull_request":{"url":"https://api.github.com/repos/peterharding/git_ph_example/pulls/22","id":176920827,"html_url":"https://github.com/peterharding/git_ph_example/pull/22","diff_url":"https://github.com/peterharding/git_ph_example/pull/22.diff","patch_url":"https://github.com/peterharding/git_ph_example/pull/22.patch","issue_url":"https://api.github.com/repos/peterharding/git_ph_example/issues/22","number":22,"state":"closed","locked":false,"title":"2-2:  Resolve Squash","user":{"login":"peterharding","id":4420975,"avatar_url":"https://avatars2.githubusercontent.com/u/4420975?v=4","gravatar_id":"","url":"https://api.github.com/users/peterharding","html_url":"https://github.com/peterharding","followers_url":"https://api.github.com/users/peterharding/followers","following_url":"https://api.github.com/users/peterharding/following{/other_user}","gists_url":"https://api.github.com/users/peterharding/gists{/gist_id}","starred_url":"https://api.github.com/users/peterharding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peterharding/subscriptions","organizations_url":"https://api.github.com/users/peterharding/orgs","repos_url":"https://api.github.com/users/peterharding/repos","events_url":"https://api.github.com/users/peterharding/events{/privacy}","received_events_url":"https://api.github.com/users/peterharding/received_events","type":"User","site_admin":false},"body":"How does squash handle conflicts?","created_at":"2018-03-22T21:56:50Z","updated_at":"2018-03-22T22:32:37Z","closed_at":"2018-03-22T22:32:37Z","merged_at":null,"merge_commit_sha":"ef42aa6ecb298580474888213741460c17a1cb98","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":876558408,"url":"https://api.github.com/repos/peterharding/git_ph_example/labels/ignore","name":"ignore","color":"b60205","default":false}],"milestone":null,"commits_url":"https://api.github.com/repos/peterharding/git_ph_example/pulls/22/commits","review_comments_url":"https://api.github.com/repos/peterharding/git_ph_example/pulls/22/comments","review_comment_url":"https://api.github.com/repos/peterharding/git_ph_example/pulls/comments{/number}","comments_url":"https://api.github.com/repos/peterharding/git_ph_example/issues/22/comments","statuses_url":"https://api.github.com/repos/peterharding/git_ph_example/statuses/1de609337efa1301ab55badc59a1ac719d2ea5e4","head":{"label":"peterharding:2-2-resolve-squash","ref":"2-2-resolve-squash","sha":"1de609337efa1301ab55badc59a1ac719d2ea5e4","user":{"login":"peterharding","id":4420975,"avatar_url":"https://avatars2.githubusercontent.com/u/4420975?v=4","gravatar_id":"","url":"https://api.github.com/users/peterharding","html_url":"https://github.com/peterharding","followers_url":"https://api.github.com/users/peterharding/followers","following_url":"https://api.github.com/users/peterharding/following{/other_user}","gists_url":"https://api.github.com/users/peterharding/gists{/gist_id}","starred_url":"https://api.github.com/users/peterharding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peterharding/subscriptions","organizations_url":"https://api.github.com/users/peterharding/orgs","repos_url":"https://api.github.com/users/peterharding/repos","events_url":"https://api.github.com/users/peterharding/events{/privacy}","received_events_url":"https://api.github.com/users/peterharding/received_events","type":"User","site_admin":false},"repo":{"id":126056829,"name":"git_ph_example","full_name":"peterharding/git_ph_example","owner":{"login":"peterharding","id":4420975,"avatar_url":"https://avatars2.githubusercontent.com/u/4420975?v=4","gravatar_id":"","url":"https://api.github.com/users/peterharding","html_url":"https://github.com/peterharding","followers_url":"https://api.github.com/users/peterharding/followers","following_url":"https://api.github.com/users/peterharding/following{/other_user}","gists_url":"https://api.github.com/users/peterharding/gists{/gist_id}","starred_url":"https://api.github.com/users/peterharding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peterharding/subscriptions","organizations_url":"https://api.github.com/users/peterharding/orgs","repos_url":"https://api.github.com/users/peterharding/repos","events_url":"https://api.github.com/users/peterharding/events{/privacy}","received_events_url":"https://api.github.com/users/peterharding/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/peterharding/git_ph_example","description":"git process examples","fork":false,"url":"https://api.github.com/repos/peterharding/git_ph_example","forks_url":"https://api.github.com/repos/peterharding/git_ph_example/forks","keys_url":"https://api.github.com/repos/peterharding/git_ph_example/keys{/key_id}","collaborators_url":"https://api.github.com/repos/peterharding/git_ph_example/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/peterharding/git_ph_example/teams","hooks_url":"https://api.github.com/repos/peterharding/git_ph_example/hooks","issue_events_url":"https://api.github.com/repos/peterharding/git_ph_example/issues/events{/number}","events_url":"https://api.github.com/repos/peterharding/git_ph_example/events","assignees_url":"https://api.github.com/repos/peterharding/git_ph_example/assignees{/user}","branches_url":"https://api.github.com/repos/peterharding/git_ph_example/branches{/branch}","tags_url":"https://api.github.com/repos/peterharding/git_ph_example/tags","blobs_url":"https://api.github.com/repos/peterharding/git_ph_example/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/peterharding/git_ph_example/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/peterharding/git_ph_example/git/refs{/sha}","trees_url":"https://api.github.com/repos/peterharding/git_ph_example/git/trees{/sha}","statuses_url":"https://api.github.com/repos/peterharding/git_ph_example/statuses/{sha}","languages_url":"https://api.github.com/repos/peterharding/git_ph_example/languages","stargazers_url":"https://api.github.com/repos/peterharding/git_ph_example/stargazers","contributors_url":"https://api.github.com/repos/peterharding/git_ph_example/contributors","subscribers_url":"https://api.github.com/repos/peterharding/git_ph_example/subscribers","subscription_url":"https://api.github.com/repos/peterharding/git_ph_example/subscription","commits_url":"https://api.github.com/repos/peterharding/git_ph_example/commits{/sha}","git_commits_url":"https://api.github.com/repos/peterharding/git_ph_example/git/commits{/sha}","comments_url":"https://api.github.com/repos/peterharding/git_ph_example/comments{/number}","issue_comment_url":"https://api.github.com/repos/peterharding/git_ph_example/issues/comments{/number}","contents_url":"https://api.github.com/repos/peterharding/git_ph_example/contents/{+path}","compare_url":"https://api.github.com/repos/peterharding/git_ph_example/compare/{base}...{head}","merges_url":"https://api.github.com/repos/peterharding/git_ph_example/merges","archive_url":"https://api.github.com/repos/peterharding/git_ph_example/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/peterharding/git_ph_example/downloads","issues_url":"https://api.github.com/repos/peterharding/git_ph_example/issues{/number}","pulls_url":"https://api.github.com/repos/peterharding/git_ph_example/pulls{/number}","milestones_url":"https://api.github.com/repos/peterharding/git_ph_example/milestones{/number}","notifications_url":"https://api.github.com/repos/peterharding/git_ph_example/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/peterharding/git_ph_example/labels{/name}","releases_url":"https://api.github.com/repos/peterharding/git_ph_example/releases{/id}","deployments_url":"https://api.github.com/repos/peterharding/git_ph_example/deployments","created_at":"2018-03-20T17:27:59Z","updated_at":"2018-03-22T17:09:44Z","pushed_at":"2018-03-22T22:32:30Z","git_url":"git://github.com/peterharding/git_ph_example.git","ssh_url":"git@github.com:peterharding/git_ph_example.git","clone_url":"https://github.com/peterharding/git_ph_example.git","svn_url":"https://github.com/peterharding/git_ph_example","homepage":null,"size":17,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":7,"license":null,"forks":0,"open_issues":7,"watchers":0,"default_branch":"dev"}},"base":{"label":"peterharding:6-conflict-squash","ref":"6-conflict-squash","sha":"c3155b9ceac3f62273cfcf118f24caf546796378","user":{"login":"peterharding","id":4420975,"avatar_url":"https://avatars2.githubusercontent.com/u/4420975?v=4","gravatar_id":"","url":"https://api.github.com/users/peterharding","html_url":"https://github.com/peterharding","followers_url":"https://api.github.com/users/peterharding/followers","following_url":"https://api.github.com/users/peterharding/following{/other_user}","gists_url":"https://api.github.com/users/peterharding/gists{/gist_id}","starred_url":"https://api.github.com/users/peterharding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peterharding/subscriptions","organizations_url":"https://api.github.com/users/peterharding/orgs","repos_url":"https://api.github.com/users/peterharding/repos","events_url":"https://api.github.com/users/peterharding/events{/privacy}","received_events_url":"https://api.github.com/users/peterharding/received_events","type":"User","site_admin":false},"repo":{"id":126056829,"name":"git_ph_example","full_name":"peterharding/git_ph_example","owner":{"login":"peterharding","id":4420975,"avatar_url":"https://avatars2.githubusercontent.com/u/4420975?v=4","gravatar_id":"","url":"https://api.github.com/users/peterharding","html_url":"https://github.com/peterharding","followers_url":"https://api.github.com/users/peterharding/followers","following_url":"https://api.github.com/users/peterharding/following{/other_user}","gists_url":"https://api.github.com/users/peterharding/gists{/gist_id}","starred_url":"https://api.github.com/users/peterharding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peterharding/subscriptions","organizations_url":"https://api.github.com/users/peterharding/orgs","repos_url":"https://api.github.com/users/peterharding/repos","events_url":"https://api.github.com/users/peterharding/events{/privacy}","received_events_url":"https://api.github.com/users/peterharding/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/peterharding/git_ph_example","description":"git process examples","fork":false,"url":"https://api.github.com/repos/peterharding/git_ph_example","forks_url":"https://api.github.com/repos/peterharding/git_ph_example/forks","keys_url":"https://api.github.com/repos/peterharding/git_ph_example/keys{/key_id}","collaborators_url":"https://api.github.com/repos/peterharding/git_ph_example/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/peterharding/git_ph_example/teams","hooks_url":"https://api.github.com/repos/peterharding/git_ph_example/hooks","issue_events_url":"https://api.github.com/repos/peterharding/git_ph_example/issues/events{/number}","events_url":"https://api.github.com/repos/peterharding/git_ph_example/events","assignees_url":"https://api.github.com/repos/peterharding/git_ph_example/assignees{/user}","branches_url":"https://api.github.com/repos/peterharding/git_ph_example/branches{/branch}","tags_url":"https://api.github.com/repos/peterharding/git_ph_example/tags","blobs_url":"https://api.github.com/repos/peterharding/git_ph_example/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/peterharding/git_ph_example/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/peterharding/git_ph_example/git/refs{/sha}","trees_url":"https://api.github.com/repos/peterharding/git_ph_example/git/trees{/sha}","statuses_url":"https://api.github.com/repos/peterharding/git_ph_example/statuses/{sha}","languages_url":"https://api.github.com/repos/peterharding/git_ph_example/languages","stargazers_url":"https://api.github.com/repos/peterharding/git_ph_example/stargazers","contributors_url":"https://api.github.com/repos/peterharding/git_ph_example/contributors","subscribers_url":"https://api.github.com/repos/peterharding/git_ph_example/subscribers","subscription_url":"https://api.github.com/repos/peterharding/git_ph_example/subscription","commits_url":"https://api.github.com/repos/peterharding/git_ph_example/commits{/sha}","git_commits_url":"https://api.github.com/repos/peterharding/git_ph_example/git/commits{/sha}","comments_url":"https://api.github.com/repos/peterharding/git_ph_example/comments{/number}","issue_comment_url":"https://api.github.com/repos/peterharding/git_ph_example/issues/comments{/number}","contents_url":"https://api.github.com/repos/peterharding/git_ph_example/contents/{+path}","compare_url":"https://api.github.com/repos/peterharding/git_ph_example/compare/{base}...{head}","merges_url":"https://api.github.com/repos/peterharding/git_ph_example/merges","archive_url":"https://api.github.com/repos/peterharding/git_ph_example/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/peterharding/git_ph_example/downloads","issues_url":"https://api.github.com/repos/peterharding/git_ph_example/issues{/number}","pulls_url":"https://api.github.com/repos/peterharding/git_ph_example/pulls{/number}","milestones_url":"https://api.github.com/repos/peterharding/git_ph_example/milestones{/number}","notifications_url":"https://api.github.com/repos/peterharding/git_ph_example/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/peterharding/git_ph_example/labels{/name}","releases_url":"https://api.github.com/repos/peterharding/git_ph_example/releases{/id}","deployments_url":"https://api.github.com/repos/peterharding/git_ph_example/deployments","created_at":"2018-03-20T17:27:59Z","updated_at":"2018-03-22T17:09:44Z","pushed_at":"2018-03-22T22:32:30Z","git_url":"git://github.com/peterharding/git_ph_example.git","ssh_url":"git@github.com:peterharding/git_ph_example.git","clone_url":"https://github.com/peterharding/git_ph_example.git","svn_url":"https://github.com/peterharding/git_ph_example","homepage":null,"size":17,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":7,"license":null,"forks":0,"open_issues":7,"watchers":0,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/peterharding/git_ph_example/pulls/22"},"html":{"href":"https://github.com/peterharding/git_ph_example/pull/22"},"issue":{"href":"https://api.github.com/repos/peterharding/git_ph_example/issues/22"},"comments":{"href":"https://api.github.com/repos/peterharding/git_ph_example/issues/22/comments"},"review_comments":{"href":"https://api.github.com/repos/peterharding/git_ph_example/pulls/22/comments"},"review_comment":{"href":"https://api.github.com/repos/peterharding/git_ph_example/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/peterharding/git_ph_example/pulls/22/commits"},"statuses":{"href":"https://api.github.com/repos/peterharding/git_ph_example/statuses/1de609337efa1301ab55badc59a1ac719d2ea5e4"}},"author_association":"OWNER","merged":false,"mergeable":true,"rebaseable":true,"mergeable_state":"clean","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":3,"additions":17,"deletions":1,"changed_files":2}}
{"actor":{"display_login":"peterharding"}}