{"action":"created","issue":{"url":"https://api.github.com/repos/jhanners-panopto/auto-ci-test/issues/632","repository_url":"https://api.github.com/repos/jhanners-panopto/auto-ci-test","labels_url":"https://api.github.com/repos/jhanners-panopto/auto-ci-test/issues/632/labels{/name}","comments_url":"https://api.github.com/repos/jhanners-panopto/auto-ci-test/issues/632/comments","events_url":"https://api.github.com/repos/jhanners-panopto/auto-ci-test/issues/632/events","html_url":"https://github.com/jhanners-panopto/auto-ci-test/pull/632","id":373194837,"node_id":"MDExOlB1bGxSZXF1ZXN0MjI1MTgyMTY0","number":632,"title":"[Auto CI] Merge auto_ci/merge-hf.03-to-hf.04-integration -> hf.04","user":{"login":"panopto-automation","id":32582730,"node_id":"MDQ6VXNlcjMyNTgyNzMw","avatar_url":"https://avatars0.githubusercontent.com/u/32582730?v=4","gravatar_id":"","url":"https://api.github.com/users/panopto-automation","html_url":"https://github.com/panopto-automation","followers_url":"https://api.github.com/users/panopto-automation/followers","following_url":"https://api.github.com/users/panopto-automation/following{/other_user}","gists_url":"https://api.github.com/users/panopto-automation/gists{/gist_id}","starred_url":"https://api.github.com/users/panopto-automation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/panopto-automation/subscriptions","organizations_url":"https://api.github.com/users/panopto-automation/orgs","repos_url":"https://api.github.com/users/panopto-automation/repos","events_url":"https://api.github.com/users/panopto-automation/events{/privacy}","received_events_url":"https://api.github.com/users/panopto-automation/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":{"login":"panopto-automation","id":32582730,"node_id":"MDQ6VXNlcjMyNTgyNzMw","avatar_url":"https://avatars0.githubusercontent.com/u/32582730?v=4","gravatar_id":"","url":"https://api.github.com/users/panopto-automation","html_url":"https://github.com/panopto-automation","followers_url":"https://api.github.com/users/panopto-automation/followers","following_url":"https://api.github.com/users/panopto-automation/following{/other_user}","gists_url":"https://api.github.com/users/panopto-automation/gists{/gist_id}","starred_url":"https://api.github.com/users/panopto-automation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/panopto-automation/subscriptions","organizations_url":"https://api.github.com/users/panopto-automation/orgs","repos_url":"https://api.github.com/users/panopto-automation/repos","events_url":"https://api.github.com/users/panopto-automation/events{/privacy}","received_events_url":"https://api.github.com/users/panopto-automation/received_events","type":"User","site_admin":false},"assignees":[{"login":"panopto-automation","id":32582730,"node_id":"MDQ6VXNlcjMyNTgyNzMw","avatar_url":"https://avatars0.githubusercontent.com/u/32582730?v=4","gravatar_id":"","url":"https://api.github.com/users/panopto-automation","html_url":"https://github.com/panopto-automation","followers_url":"https://api.github.com/users/panopto-automation/followers","following_url":"https://api.github.com/users/panopto-automation/following{/other_user}","gists_url":"https://api.github.com/users/panopto-automation/gists{/gist_id}","starred_url":"https://api.github.com/users/panopto-automation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/panopto-automation/subscriptions","organizations_url":"https://api.github.com/users/panopto-automation/orgs","repos_url":"https://api.github.com/users/panopto-automation/repos","events_url":"https://api.github.com/users/panopto-automation/events{/privacy}","received_events_url":"https://api.github.com/users/panopto-automation/received_events","type":"User","site_admin":false}],"milestone":null,"comments":1,"created_at":"2018-10-23T20:49:05Z","updated_at":"2018-10-23T20:49:11Z","closed_at":null,"author_association":"COLLABORATOR","pull_request":{"url":"https://api.github.com/repos/jhanners-panopto/auto-ci-test/pulls/632","html_url":"https://github.com/jhanners-panopto/auto-ci-test/pull/632","diff_url":"https://github.com/jhanners-panopto/auto-ci-test/pull/632.diff","patch_url":"https://github.com/jhanners-panopto/auto-ci-test/pull/632.patch"},"body":"{\n    \"assignees-set\": true, \n    \"destination-branch\": \"hf.04\", \n    \"integration-pull-request\": 631, \n    \"source-branch\": \"auto_ci/merge-hf.03-to-hf.04-integration\", \n    \"valid-until\": \"2018-10-23T21:49:05.520000\", \n    \"work-in-progress\": true\n}"},"comment":{"url":"https://api.github.com/repos/jhanners-panopto/auto-ci-test/issues/comments/432414017","html_url":"https://github.com/jhanners-panopto/auto-ci-test/pull/632#issuecomment-432414017","issue_url":"https://api.github.com/repos/jhanners-panopto/auto-ci-test/issues/632","id":432414017,"node_id":"MDEyOklzc3VlQ29tbWVudDQzMjQxNDAxNw==","user":{"login":"panopto-automation","id":32582730,"node_id":"MDQ6VXNlcjMyNTgyNzMw","avatar_url":"https://avatars0.githubusercontent.com/u/32582730?v=4","gravatar_id":"","url":"https://api.github.com/users/panopto-automation","html_url":"https://github.com/panopto-automation","followers_url":"https://api.github.com/users/panopto-automation/followers","following_url":"https://api.github.com/users/panopto-automation/following{/other_user}","gists_url":"https://api.github.com/users/panopto-automation/gists{/gist_id}","starred_url":"https://api.github.com/users/panopto-automation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/panopto-automation/subscriptions","organizations_url":"https://api.github.com/users/panopto-automation/orgs","repos_url":"https://api.github.com/users/panopto-automation/repos","events_url":"https://api.github.com/users/panopto-automation/events{/privacy}","received_events_url":"https://api.github.com/users/panopto-automation/received_events","type":"User","site_admin":false},"created_at":"2018-10-23T20:49:11Z","updated_at":"2018-10-23T20:49:11Z","author_association":"COLLABORATOR","body":"# Manual merge conflict resolution _may_ be required\n\nThis is the final pull request, merging from the integration branch `auto_ci/merge-hf.03-to-hf.04-integration` to the destination\nbranch `hf.04`.\n\nManual merge conflict resolution was required when merging from source branch `auto_ci/pinned-hf.03-to-hf.04` to\nintegration branch `auto_ci/merge-hf.03-to-hf.04-integration`.\n\nOut of an abundance of caution, we require that the final merge to `hf.04` be performed\nmanually.\n\n## If manual merge conflict resolution _is not_ required\n\nGet the required number of reviewers to approve the pull request and manually merge it to the destination branch.\n\n## If manual merge conflict resolution _is_ required\n\n### Resolve merge conflicts locally\n\nRun the following commands locally to resolve merge conflicts.\n```\ngit fetch --all\ngit checkout -B \"auto_ci/merge-hf.03-to-hf.04-integration\" \"origin/auto_ci/merge-hf.03-to-hf.04-integration\"\ngit merge \"origin/hf.04\"\ngit mergetool\n```\n\n### Build locally\n\nFor `shuksan` branches and beyond:\n```\npython.exe build_solution.py --clean --db-name LocalMergeConflictResolution\n```\nFor branches prior to `shuksan`:\n```\nbuild_solution.bat\n```\n\n### Update the integration branch\n\nWhen local build passes and merge conflicts are resolved, push to the integration branch.\n```\ngit commit -m \"Manually resolve conflicts for merge from auto_ci/merge-hf.03-to-hf.04-integration to hf.04\"\ngit push -u origin head\n```\n\nAfter the integration branch has been updated, get the required number of reviewers to approve the pull request and\nmanually merge it to the destination branch.\n\n# Finish\n\nNo further action should be required.  Do not delete the integration branch; this will be cleaned up by the auto CI\ntool when it next runs.\n\n# References\n\n* [GitHub Automatic Continuous Integration](https://docs.google.com/document/d/1INwUhO40S7Owyb71zGcLbA0yWoXKXA_fJRSGQw1fQ3I/edit)\n"}}
{"actor":{"display_login":"panopto-automation"}}