{"action":"closed","number":209,"pull_request":{"url":"https://api.github.com/repos/SmarterApp/AP_Common/pulls/209","id":190667567,"html_url":"https://github.com/SmarterApp/AP_Common/pull/209","diff_url":"https://github.com/SmarterApp/AP_Common/pull/209.diff","patch_url":"https://github.com/SmarterApp/AP_Common/pull/209.patch","issue_url":"https://api.github.com/repos/SmarterApp/AP_Common/issues/209","number":209,"state":"closed","locked":false,"title":"IAT-1838: Added merge conflict resolution that uses system commands t…","user":{"login":"bdrainer","id":4502845,"avatar_url":"https://avatars1.githubusercontent.com/u/4502845?v=4","gravatar_id":"","url":"https://api.github.com/users/bdrainer","html_url":"https://github.com/bdrainer","followers_url":"https://api.github.com/users/bdrainer/followers","following_url":"https://api.github.com/users/bdrainer/following{/other_user}","gists_url":"https://api.github.com/users/bdrainer/gists{/gist_id}","starred_url":"https://api.github.com/users/bdrainer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bdrainer/subscriptions","organizations_url":"https://api.github.com/users/bdrainer/orgs","repos_url":"https://api.github.com/users/bdrainer/repos","events_url":"https://api.github.com/users/bdrainer/events{/privacy}","received_events_url":"https://api.github.com/users/bdrainer/received_events","type":"User","site_admin":false},"body":"…o merge git outside of the application.  The application does not support the advanced merge we need so using system commands allows us to do this","created_at":"2018-05-25T18:47:10Z","updated_at":"2018-05-25T18:51:54Z","closed_at":"2018-05-25T18:51:54Z","merged_at":"2018-05-25T18:51:54Z","merge_commit_sha":"31063aeb972a0588f9c56440b093cb1d3829bc3b","assignee":null,"assignees":[],"requested_reviewers":[{"login":"rmitchell3","id":671860,"avatar_url":"https://avatars1.githubusercontent.com/u/671860?v=4","gravatar_id":"","url":"https://api.github.com/users/rmitchell3","html_url":"https://github.com/rmitchell3","followers_url":"https://api.github.com/users/rmitchell3/followers","following_url":"https://api.github.com/users/rmitchell3/following{/other_user}","gists_url":"https://api.github.com/users/rmitchell3/gists{/gist_id}","starred_url":"https://api.github.com/users/rmitchell3/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rmitchell3/subscriptions","organizations_url":"https://api.github.com/users/rmitchell3/orgs","repos_url":"https://api.github.com/users/rmitchell3/repos","events_url":"https://api.github.com/users/rmitchell3/events{/privacy}","received_events_url":"https://api.github.com/users/rmitchell3/received_events","type":"User","site_admin":false},{"login":"alex-ponce","id":20801968,"avatar_url":"https://avatars2.githubusercontent.com/u/20801968?v=4","gravatar_id":"","url":"https://api.github.com/users/alex-ponce","html_url":"https://github.com/alex-ponce","followers_url":"https://api.github.com/users/alex-ponce/followers","following_url":"https://api.github.com/users/alex-ponce/following{/other_user}","gists_url":"https://api.github.com/users/alex-ponce/gists{/gist_id}","starred_url":"https://api.github.com/users/alex-ponce/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alex-ponce/subscriptions","organizations_url":"https://api.github.com/users/alex-ponce/orgs","repos_url":"https://api.github.com/users/alex-ponce/repos","events_url":"https://api.github.com/users/alex-ponce/events{/privacy}","received_events_url":"https://api.github.com/users/alex-ponce/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/SmarterApp/AP_Common/pulls/209/commits","review_comments_url":"https://api.github.com/repos/SmarterApp/AP_Common/pulls/209/comments","review_comment_url":"https://api.github.com/repos/SmarterApp/AP_Common/pulls/comments{/number}","comments_url":"https://api.github.com/repos/SmarterApp/AP_Common/issues/209/comments","statuses_url":"https://api.github.com/repos/SmarterApp/AP_Common/statuses/f9abec93f962895bac1b2027754d9f2000fccd54","head":{"label":"SmarterApp:hotfix/IAT-1838","ref":"hotfix/IAT-1838","sha":"f9abec93f962895bac1b2027754d9f2000fccd54","user":{"login":"SmarterApp","id":7026395,"avatar_url":"https://avatars0.githubusercontent.com/u/7026395?v=4","gravatar_id":"","url":"https://api.github.com/users/SmarterApp","html_url":"https://github.com/SmarterApp","followers_url":"https://api.github.com/users/SmarterApp/followers","following_url":"https://api.github.com/users/SmarterApp/following{/other_user}","gists_url":"https://api.github.com/users/SmarterApp/gists{/gist_id}","starred_url":"https://api.github.com/users/SmarterApp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SmarterApp/subscriptions","organizations_url":"https://api.github.com/users/SmarterApp/orgs","repos_url":"https://api.github.com/users/SmarterApp/repos","events_url":"https://api.github.com/users/SmarterApp/events{/privacy}","received_events_url":"https://api.github.com/users/SmarterApp/received_events","type":"Organization","site_admin":false},"repo":{"id":94477208,"name":"AP_Common","full_name":"SmarterApp/AP_Common","owner":{"login":"SmarterApp","id":7026395,"avatar_url":"https://avatars0.githubusercontent.com/u/7026395?v=4","gravatar_id":"","url":"https://api.github.com/users/SmarterApp","html_url":"https://github.com/SmarterApp","followers_url":"https://api.github.com/users/SmarterApp/followers","following_url":"https://api.github.com/users/SmarterApp/following{/other_user}","gists_url":"https://api.github.com/users/SmarterApp/gists{/gist_id}","starred_url":"https://api.github.com/users/SmarterApp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SmarterApp/subscriptions","organizations_url":"https://api.github.com/users/SmarterApp/orgs","repos_url":"https://api.github.com/users/SmarterApp/repos","events_url":"https://api.github.com/users/SmarterApp/events{/privacy}","received_events_url":"https://api.github.com/users/SmarterApp/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/SmarterApp/AP_Common","description":"Common Java code shared by the AP services.","fork":false,"url":"https://api.github.com/repos/SmarterApp/AP_Common","forks_url":"https://api.github.com/repos/SmarterApp/AP_Common/forks","keys_url":"https://api.github.com/repos/SmarterApp/AP_Common/keys{/key_id}","collaborators_url":"https://api.github.com/repos/SmarterApp/AP_Common/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/SmarterApp/AP_Common/teams","hooks_url":"https://api.github.com/repos/SmarterApp/AP_Common/hooks","issue_events_url":"https://api.github.com/repos/SmarterApp/AP_Common/issues/events{/number}","events_url":"https://api.github.com/repos/SmarterApp/AP_Common/events","assignees_url":"https://api.github.com/repos/SmarterApp/AP_Common/assignees{/user}","branches_url":"https://api.github.com/repos/SmarterApp/AP_Common/branches{/branch}","tags_url":"https://api.github.com/repos/SmarterApp/AP_Common/tags","blobs_url":"https://api.github.com/repos/SmarterApp/AP_Common/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/SmarterApp/AP_Common/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/SmarterApp/AP_Common/git/refs{/sha}","trees_url":"https://api.github.com/repos/SmarterApp/AP_Common/git/trees{/sha}","statuses_url":"https://api.github.com/repos/SmarterApp/AP_Common/statuses/{sha}","languages_url":"https://api.github.com/repos/SmarterApp/AP_Common/languages","stargazers_url":"https://api.github.com/repos/SmarterApp/AP_Common/stargazers","contributors_url":"https://api.github.com/repos/SmarterApp/AP_Common/contributors","subscribers_url":"https://api.github.com/repos/SmarterApp/AP_Common/subscribers","subscription_url":"https://api.github.com/repos/SmarterApp/AP_Common/subscription","commits_url":"https://api.github.com/repos/SmarterApp/AP_Common/commits{/sha}","git_commits_url":"https://api.github.com/repos/SmarterApp/AP_Common/git/commits{/sha}","comments_url":"https://api.github.com/repos/SmarterApp/AP_Common/comments{/number}","issue_comment_url":"https://api.github.com/repos/SmarterApp/AP_Common/issues/comments{/number}","contents_url":"https://api.github.com/repos/SmarterApp/AP_Common/contents/{+path}","compare_url":"https://api.github.com/repos/SmarterApp/AP_Common/compare/{base}...{head}","merges_url":"https://api.github.com/repos/SmarterApp/AP_Common/merges","archive_url":"https://api.github.com/repos/SmarterApp/AP_Common/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/SmarterApp/AP_Common/downloads","issues_url":"https://api.github.com/repos/SmarterApp/AP_Common/issues{/number}","pulls_url":"https://api.github.com/repos/SmarterApp/AP_Common/pulls{/number}","milestones_url":"https://api.github.com/repos/SmarterApp/AP_Common/milestones{/number}","notifications_url":"https://api.github.com/repos/SmarterApp/AP_Common/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/SmarterApp/AP_Common/labels{/name}","releases_url":"https://api.github.com/repos/SmarterApp/AP_Common/releases{/id}","deployments_url":"https://api.github.com/repos/SmarterApp/AP_Common/deployments","created_at":"2017-06-15T20:42:01Z","updated_at":"2018-05-25T18:51:38Z","pushed_at":"2018-05-25T18:51:54Z","git_url":"git://github.com/SmarterApp/AP_Common.git","ssh_url":"git@github.com:SmarterApp/AP_Common.git","clone_url":"https://github.com/SmarterApp/AP_Common.git","svn_url":"https://github.com/SmarterApp/AP_Common","homepage":null,"size":2081,"stargazers_count":0,"watchers_count":0,"language":"Java","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":0,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"SmarterApp:develop","ref":"develop","sha":"04d10345c3ab5e6f3233ea3a822a31f98b510594","user":{"login":"SmarterApp","id":7026395,"avatar_url":"https://avatars0.githubusercontent.com/u/7026395?v=4","gravatar_id":"","url":"https://api.github.com/users/SmarterApp","html_url":"https://github.com/SmarterApp","followers_url":"https://api.github.com/users/SmarterApp/followers","following_url":"https://api.github.com/users/SmarterApp/following{/other_user}","gists_url":"https://api.github.com/users/SmarterApp/gists{/gist_id}","starred_url":"https://api.github.com/users/SmarterApp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SmarterApp/subscriptions","organizations_url":"https://api.github.com/users/SmarterApp/orgs","repos_url":"https://api.github.com/users/SmarterApp/repos","events_url":"https://api.github.com/users/SmarterApp/events{/privacy}","received_events_url":"https://api.github.com/users/SmarterApp/received_events","type":"Organization","site_admin":false},"repo":{"id":94477208,"name":"AP_Common","full_name":"SmarterApp/AP_Common","owner":{"login":"SmarterApp","id":7026395,"avatar_url":"https://avatars0.githubusercontent.com/u/7026395?v=4","gravatar_id":"","url":"https://api.github.com/users/SmarterApp","html_url":"https://github.com/SmarterApp","followers_url":"https://api.github.com/users/SmarterApp/followers","following_url":"https://api.github.com/users/SmarterApp/following{/other_user}","gists_url":"https://api.github.com/users/SmarterApp/gists{/gist_id}","starred_url":"https://api.github.com/users/SmarterApp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SmarterApp/subscriptions","organizations_url":"https://api.github.com/users/SmarterApp/orgs","repos_url":"https://api.github.com/users/SmarterApp/repos","events_url":"https://api.github.com/users/SmarterApp/events{/privacy}","received_events_url":"https://api.github.com/users/SmarterApp/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/SmarterApp/AP_Common","description":"Common Java code shared by the AP services.","fork":false,"url":"https://api.github.com/repos/SmarterApp/AP_Common","forks_url":"https://api.github.com/repos/SmarterApp/AP_Common/forks","keys_url":"https://api.github.com/repos/SmarterApp/AP_Common/keys{/key_id}","collaborators_url":"https://api.github.com/repos/SmarterApp/AP_Common/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/SmarterApp/AP_Common/teams","hooks_url":"https://api.github.com/repos/SmarterApp/AP_Common/hooks","issue_events_url":"https://api.github.com/repos/SmarterApp/AP_Common/issues/events{/number}","events_url":"https://api.github.com/repos/SmarterApp/AP_Common/events","assignees_url":"https://api.github.com/repos/SmarterApp/AP_Common/assignees{/user}","branches_url":"https://api.github.com/repos/SmarterApp/AP_Common/branches{/branch}","tags_url":"https://api.github.com/repos/SmarterApp/AP_Common/tags","blobs_url":"https://api.github.com/repos/SmarterApp/AP_Common/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/SmarterApp/AP_Common/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/SmarterApp/AP_Common/git/refs{/sha}","trees_url":"https://api.github.com/repos/SmarterApp/AP_Common/git/trees{/sha}","statuses_url":"https://api.github.com/repos/SmarterApp/AP_Common/statuses/{sha}","languages_url":"https://api.github.com/repos/SmarterApp/AP_Common/languages","stargazers_url":"https://api.github.com/repos/SmarterApp/AP_Common/stargazers","contributors_url":"https://api.github.com/repos/SmarterApp/AP_Common/contributors","subscribers_url":"https://api.github.com/repos/SmarterApp/AP_Common/subscribers","subscription_url":"https://api.github.com/repos/SmarterApp/AP_Common/subscription","commits_url":"https://api.github.com/repos/SmarterApp/AP_Common/commits{/sha}","git_commits_url":"https://api.github.com/repos/SmarterApp/AP_Common/git/commits{/sha}","comments_url":"https://api.github.com/repos/SmarterApp/AP_Common/comments{/number}","issue_comment_url":"https://api.github.com/repos/SmarterApp/AP_Common/issues/comments{/number}","contents_url":"https://api.github.com/repos/SmarterApp/AP_Common/contents/{+path}","compare_url":"https://api.github.com/repos/SmarterApp/AP_Common/compare/{base}...{head}","merges_url":"https://api.github.com/repos/SmarterApp/AP_Common/merges","archive_url":"https://api.github.com/repos/SmarterApp/AP_Common/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/SmarterApp/AP_Common/downloads","issues_url":"https://api.github.com/repos/SmarterApp/AP_Common/issues{/number}","pulls_url":"https://api.github.com/repos/SmarterApp/AP_Common/pulls{/number}","milestones_url":"https://api.github.com/repos/SmarterApp/AP_Common/milestones{/number}","notifications_url":"https://api.github.com/repos/SmarterApp/AP_Common/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/SmarterApp/AP_Common/labels{/name}","releases_url":"https://api.github.com/repos/SmarterApp/AP_Common/releases{/id}","deployments_url":"https://api.github.com/repos/SmarterApp/AP_Common/deployments","created_at":"2017-06-15T20:42:01Z","updated_at":"2018-05-25T18:51:38Z","pushed_at":"2018-05-25T18:51:54Z","git_url":"git://github.com/SmarterApp/AP_Common.git","ssh_url":"git@github.com:SmarterApp/AP_Common.git","clone_url":"https://github.com/SmarterApp/AP_Common.git","svn_url":"https://github.com/SmarterApp/AP_Common","homepage":null,"size":2081,"stargazers_count":0,"watchers_count":0,"language":"Java","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":0,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/SmarterApp/AP_Common/pulls/209"},"html":{"href":"https://github.com/SmarterApp/AP_Common/pull/209"},"issue":{"href":"https://api.github.com/repos/SmarterApp/AP_Common/issues/209"},"comments":{"href":"https://api.github.com/repos/SmarterApp/AP_Common/issues/209/comments"},"review_comments":{"href":"https://api.github.com/repos/SmarterApp/AP_Common/pulls/209/comments"},"review_comment":{"href":"https://api.github.com/repos/SmarterApp/AP_Common/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/SmarterApp/AP_Common/pulls/209/commits"},"statuses":{"href":"https://api.github.com/repos/SmarterApp/AP_Common/statuses/f9abec93f962895bac1b2027754d9f2000fccd54"}},"author_association":"CONTRIBUTOR","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"bdrainer","id":4502845,"avatar_url":"https://avatars1.githubusercontent.com/u/4502845?v=4","gravatar_id":"","url":"https://api.github.com/users/bdrainer","html_url":"https://github.com/bdrainer","followers_url":"https://api.github.com/users/bdrainer/followers","following_url":"https://api.github.com/users/bdrainer/following{/other_user}","gists_url":"https://api.github.com/users/bdrainer/gists{/gist_id}","starred_url":"https://api.github.com/users/bdrainer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bdrainer/subscriptions","organizations_url":"https://api.github.com/users/bdrainer/orgs","repos_url":"https://api.github.com/users/bdrainer/repos","events_url":"https://api.github.com/users/bdrainer/events{/privacy}","received_events_url":"https://api.github.com/users/bdrainer/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":98,"deletions":25,"changed_files":2}}
{"actor":{"display_login":"bdrainer"}}