{"action":"created","issue":{"url":"https://api.github.com/repos/PTC-ALM/TortoiseSI/issues/190","labels_url":"https://api.github.com/repos/PTC-ALM/TortoiseSI/issues/190/labels{/name}","comments_url":"https://api.github.com/repos/PTC-ALM/TortoiseSI/issues/190/comments","events_url":"https://api.github.com/repos/PTC-ALM/TortoiseSI/issues/190/events","html_url":"https://github.com/PTC-ALM/TortoiseSI/issues/190","id":119497616,"number":190,"title":"Merge Conflict function does not work as expected","user":{"login":"KristinaTaylor","id":10520385,"avatar_url":"https://avatars.githubusercontent.com/u/10520385?v=3","gravatar_id":"","url":"https://api.github.com/users/KristinaTaylor","html_url":"https://github.com/KristinaTaylor","followers_url":"https://api.github.com/users/KristinaTaylor/followers","following_url":"https://api.github.com/users/KristinaTaylor/following{/other_user}","gists_url":"https://api.github.com/users/KristinaTaylor/gists{/gist_id}","starred_url":"https://api.github.com/users/KristinaTaylor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KristinaTaylor/subscriptions","organizations_url":"https://api.github.com/users/KristinaTaylor/orgs","repos_url":"https://api.github.com/users/KristinaTaylor/repos","events_url":"https://api.github.com/users/KristinaTaylor/events{/privacy}","received_events_url":"https://api.github.com/users/KristinaTaylor/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/PTC-ALM/TortoiseSI/labels/bug","name":"bug","color":"fc2929"}],"state":"closed","locked":false,"assignee":{"login":"krrish1008","id":8945681,"avatar_url":"https://avatars.githubusercontent.com/u/8945681?v=3","gravatar_id":"","url":"https://api.github.com/users/krrish1008","html_url":"https://github.com/krrish1008","followers_url":"https://api.github.com/users/krrish1008/followers","following_url":"https://api.github.com/users/krrish1008/following{/other_user}","gists_url":"https://api.github.com/users/krrish1008/gists{/gist_id}","starred_url":"https://api.github.com/users/krrish1008/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/krrish1008/subscriptions","organizations_url":"https://api.github.com/users/krrish1008/orgs","repos_url":"https://api.github.com/users/krrish1008/repos","events_url":"https://api.github.com/users/krrish1008/events{/privacy}","received_events_url":"https://api.github.com/users/krrish1008/received_events","type":"User","site_admin":false},"milestone":{"url":"https://api.github.com/repos/PTC-ALM/TortoiseSI/milestones/15","html_url":"https://github.com/PTC-ALM/TortoiseSI/milestones/1.1","labels_url":"https://api.github.com/repos/PTC-ALM/TortoiseSI/milestones/15/labels","id":1397595,"number":15,"title":"1.1","description":"","creator":{"login":"KristinaTaylor","id":10520385,"avatar_url":"https://avatars.githubusercontent.com/u/10520385?v=3","gravatar_id":"","url":"https://api.github.com/users/KristinaTaylor","html_url":"https://github.com/KristinaTaylor","followers_url":"https://api.github.com/users/KristinaTaylor/followers","following_url":"https://api.github.com/users/KristinaTaylor/following{/other_user}","gists_url":"https://api.github.com/users/KristinaTaylor/gists{/gist_id}","starred_url":"https://api.github.com/users/KristinaTaylor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KristinaTaylor/subscriptions","organizations_url":"https://api.github.com/users/KristinaTaylor/orgs","repos_url":"https://api.github.com/users/KristinaTaylor/repos","events_url":"https://api.github.com/users/KristinaTaylor/events{/privacy}","received_events_url":"https://api.github.com/users/KristinaTaylor/received_events","type":"User","site_admin":false},"open_issues":4,"closed_issues":2,"state":"open","created_at":"2015-11-06T12:56:32Z","updated_at":"2015-12-09T14:26:59Z","due_on":null,"closed_at":null},"comments":1,"created_at":"2015-11-30T14:00:17Z","updated_at":"2015-12-09T14:26:59Z","closed_at":"2015-12-09T14:26:59Z","body":"The command being used in TortoiseSI to resolve merges needs to be changed. It's not working as expected.\r\n\r\nThe integration should be running:\r\nsi merge --resolve \"member name\"\r\n\r\nThis maps to RFC 1096570."},"comment":{"url":"https://api.github.com/repos/PTC-ALM/TortoiseSI/issues/comments/163256963","html_url":"https://github.com/PTC-ALM/TortoiseSI/issues/190#issuecomment-163256963","issue_url":"https://api.github.com/repos/PTC-ALM/TortoiseSI/issues/190","id":163256963,"user":{"login":"KristinaTaylor","id":10520385,"avatar_url":"https://avatars.githubusercontent.com/u/10520385?v=3","gravatar_id":"","url":"https://api.github.com/users/KristinaTaylor","html_url":"https://github.com/KristinaTaylor","followers_url":"https://api.github.com/users/KristinaTaylor/followers","following_url":"https://api.github.com/users/KristinaTaylor/following{/other_user}","gists_url":"https://api.github.com/users/KristinaTaylor/gists{/gist_id}","starred_url":"https://api.github.com/users/KristinaTaylor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KristinaTaylor/subscriptions","organizations_url":"https://api.github.com/users/KristinaTaylor/orgs","repos_url":"https://api.github.com/users/KristinaTaylor/repos","events_url":"https://api.github.com/users/KristinaTaylor/events{/privacy}","received_events_url":"https://api.github.com/users/KristinaTaylor/received_events","type":"User","site_admin":false},"created_at":"2015-12-09T14:26:59Z","updated_at":"2015-12-09T14:26:59Z","body":"Closing based on the testing note from @sharonzhao on the pull request: \"Tested with build 241 using test case 1107449. \"Merge Conflicts\" successfully resolves conflicts of the members.\r\n\r\nThis issue can be closed.\""}}