{"action":"created","comment":{"url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/comments/46715094","id":46715094,"diff_hunk":"@@ -22,21 +22,18 @@\n - Reviewers can sign off by leaving a comment on the *conversation* tab of the pull request.\n \n ### Merge\n-Once the pull request is reviewed, it can be merged to the develop branch.\n-Here are two ways to merge:\n-\n-#### 1. Command line\n+Once the pull request is reviewed, it can be merged to the develop branch. While github\n+itself can perform the merge easily, it uses the --no-ff option (no fast forward), resulting\n+in somewhat messy git logs. As a result, we do not suggest use of github for merging your\n+changes. Instead, we recommend use of the command line.\n+\n+- Merge latest changes to your feature branch from development branch:<br>```git merge develop```","path":"CONTRIBUTING.md","position":13,"original_position":13,"commit_id":"3e29e95a5dd8df2f8842f389e09fb1c4b131e994","original_commit_id":"3e29e95a5dd8df2f8842f389e09fb1c4b131e994","user":{"login":"niroyb","id":1450009,"avatar_url":"https://avatars.githubusercontent.com/u/1450009?v=3","gravatar_id":"","url":"https://api.github.com/users/niroyb","html_url":"https://github.com/niroyb","followers_url":"https://api.github.com/users/niroyb/followers","following_url":"https://api.github.com/users/niroyb/following{/other_user}","gists_url":"https://api.github.com/users/niroyb/gists{/gist_id}","starred_url":"https://api.github.com/users/niroyb/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/niroyb/subscriptions","organizations_url":"https://api.github.com/users/niroyb/orgs","repos_url":"https://api.github.com/users/niroyb/repos","events_url":"https://api.github.com/users/niroyb/events{/privacy}","received_events_url":"https://api.github.com/users/niroyb/received_events","type":"User","site_admin":false},"body":"They should pull the changes from the server develop branch before the merge.","created_at":"2015-12-04T18:35:50Z","updated_at":"2015-12-04T18:35:50Z","html_url":"https://github.com/MSFTOSSMgmt/bld-omsagent/pull/7#discussion_r46715094","pull_request_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/7","_links":{"self":{"href":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/comments/46715094"},"html":{"href":"https://github.com/MSFTOSSMgmt/bld-omsagent/pull/7#discussion_r46715094"},"pull_request":{"href":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/7"}}},"pull_request":{"url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/7","id":52693725,"html_url":"https://github.com/MSFTOSSMgmt/bld-omsagent/pull/7","diff_url":"https://github.com/MSFTOSSMgmt/bld-omsagent/pull/7.diff","patch_url":"https://github.com/MSFTOSSMgmt/bld-omsagent/pull/7.patch","issue_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/issues/7","number":7,"state":"open","locked":false,"title":"Suggest avoiding github for merging to development branch","user":{"login":"jeffaco","id":13700943,"avatar_url":"https://avatars.githubusercontent.com/u/13700943?v=3","gravatar_id":"","url":"https://api.github.com/users/jeffaco","html_url":"https://github.com/jeffaco","followers_url":"https://api.github.com/users/jeffaco/followers","following_url":"https://api.github.com/users/jeffaco/following{/other_user}","gists_url":"https://api.github.com/users/jeffaco/gists{/gist_id}","starred_url":"https://api.github.com/users/jeffaco/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jeffaco/subscriptions","organizations_url":"https://api.github.com/users/jeffaco/orgs","repos_url":"https://api.github.com/users/jeffaco/repos","events_url":"https://api.github.com/users/jeffaco/events{/privacy}","received_events_url":"https://api.github.com/users/jeffaco/received_events","type":"User","site_admin":false},"body":"@MSFTOSSMgmt/omsdevs \r\n\r\nUse of github for merges from feature branch creates messy git logs, suggest against that.","created_at":"2015-12-04T16:56:36Z","updated_at":"2015-12-04T18:35:50Z","closed_at":null,"merged_at":null,"merge_commit_sha":"072065e831964b1b56e265ef408332472f28e1e8","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/7/commits","review_comments_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/7/comments","review_comment_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/comments{/number}","comments_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/issues/7/comments","statuses_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/statuses/3e29e95a5dd8df2f8842f389e09fb1c4b131e994","head":{"label":"MSFTOSSMgmt:jeff-contrib","ref":"jeff-contrib","sha":"3e29e95a5dd8df2f8842f389e09fb1c4b131e994","user":{"login":"MSFTOSSMgmt","id":7492476,"avatar_url":"https://avatars.githubusercontent.com/u/7492476?v=3","gravatar_id":"","url":"https://api.github.com/users/MSFTOSSMgmt","html_url":"https://github.com/MSFTOSSMgmt","followers_url":"https://api.github.com/users/MSFTOSSMgmt/followers","following_url":"https://api.github.com/users/MSFTOSSMgmt/following{/other_user}","gists_url":"https://api.github.com/users/MSFTOSSMgmt/gists{/gist_id}","starred_url":"https://api.github.com/users/MSFTOSSMgmt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MSFTOSSMgmt/subscriptions","organizations_url":"https://api.github.com/users/MSFTOSSMgmt/orgs","repos_url":"https://api.github.com/users/MSFTOSSMgmt/repos","events_url":"https://api.github.com/users/MSFTOSSMgmt/events{/privacy}","received_events_url":"https://api.github.com/users/MSFTOSSMgmt/received_events","type":"Organization","site_admin":false},"repo":{"id":46750170,"name":"bld-omsagent","full_name":"MSFTOSSMgmt/bld-omsagent","owner":{"login":"MSFTOSSMgmt","id":7492476,"avatar_url":"https://avatars.githubusercontent.com/u/7492476?v=3","gravatar_id":"","url":"https://api.github.com/users/MSFTOSSMgmt","html_url":"https://github.com/MSFTOSSMgmt","followers_url":"https://api.github.com/users/MSFTOSSMgmt/followers","following_url":"https://api.github.com/users/MSFTOSSMgmt/following{/other_user}","gists_url":"https://api.github.com/users/MSFTOSSMgmt/gists{/gist_id}","starred_url":"https://api.github.com/users/MSFTOSSMgmt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MSFTOSSMgmt/subscriptions","organizations_url":"https://api.github.com/users/MSFTOSSMgmt/orgs","repos_url":"https://api.github.com/users/MSFTOSSMgmt/repos","events_url":"https://api.github.com/users/MSFTOSSMgmt/events{/privacy}","received_events_url":"https://api.github.com/users/MSFTOSSMgmt/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/MSFTOSSMgmt/bld-omsagent","description":"Build projects required for omsagent","fork":false,"url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent","forks_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/forks","keys_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/keys{/key_id}","collaborators_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/teams","hooks_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/hooks","issue_events_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/issues/events{/number}","events_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/events","assignees_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/assignees{/user}","branches_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/branches{/branch}","tags_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/tags","blobs_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/git/refs{/sha}","trees_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/git/trees{/sha}","statuses_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/statuses/{sha}","languages_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/languages","stargazers_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/stargazers","contributors_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/contributors","subscribers_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/subscribers","subscription_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/subscription","commits_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/commits{/sha}","git_commits_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/git/commits{/sha}","comments_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/comments{/number}","issue_comment_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/issues/comments{/number}","contents_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/contents/{+path}","compare_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/compare/{base}...{head}","merges_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/merges","archive_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/downloads","issues_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/issues{/number}","pulls_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls{/number}","milestones_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/milestones{/number}","notifications_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/labels{/name}","releases_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/releases{/id}","created_at":"2015-11-23T21:51:08Z","updated_at":"2015-12-04T09:54:28Z","pushed_at":"2015-12-04T17:10:46Z","git_url":"git://github.com/MSFTOSSMgmt/bld-omsagent.git","ssh_url":"git@github.com:MSFTOSSMgmt/bld-omsagent.git","clone_url":"https://github.com/MSFTOSSMgmt/bld-omsagent.git","svn_url":"https://github.com/MSFTOSSMgmt/bld-omsagent","homepage":null,"size":20,"stargazers_count":1,"watchers_count":1,"language":"Shell","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":1,"default_branch":"master"}},"base":{"label":"MSFTOSSMgmt:master","ref":"master","sha":"3492f5d459d890d2772976a7ef034b74937042fe","user":{"login":"MSFTOSSMgmt","id":7492476,"avatar_url":"https://avatars.githubusercontent.com/u/7492476?v=3","gravatar_id":"","url":"https://api.github.com/users/MSFTOSSMgmt","html_url":"https://github.com/MSFTOSSMgmt","followers_url":"https://api.github.com/users/MSFTOSSMgmt/followers","following_url":"https://api.github.com/users/MSFTOSSMgmt/following{/other_user}","gists_url":"https://api.github.com/users/MSFTOSSMgmt/gists{/gist_id}","starred_url":"https://api.github.com/users/MSFTOSSMgmt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MSFTOSSMgmt/subscriptions","organizations_url":"https://api.github.com/users/MSFTOSSMgmt/orgs","repos_url":"https://api.github.com/users/MSFTOSSMgmt/repos","events_url":"https://api.github.com/users/MSFTOSSMgmt/events{/privacy}","received_events_url":"https://api.github.com/users/MSFTOSSMgmt/received_events","type":"Organization","site_admin":false},"repo":{"id":46750170,"name":"bld-omsagent","full_name":"MSFTOSSMgmt/bld-omsagent","owner":{"login":"MSFTOSSMgmt","id":7492476,"avatar_url":"https://avatars.githubusercontent.com/u/7492476?v=3","gravatar_id":"","url":"https://api.github.com/users/MSFTOSSMgmt","html_url":"https://github.com/MSFTOSSMgmt","followers_url":"https://api.github.com/users/MSFTOSSMgmt/followers","following_url":"https://api.github.com/users/MSFTOSSMgmt/following{/other_user}","gists_url":"https://api.github.com/users/MSFTOSSMgmt/gists{/gist_id}","starred_url":"https://api.github.com/users/MSFTOSSMgmt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MSFTOSSMgmt/subscriptions","organizations_url":"https://api.github.com/users/MSFTOSSMgmt/orgs","repos_url":"https://api.github.com/users/MSFTOSSMgmt/repos","events_url":"https://api.github.com/users/MSFTOSSMgmt/events{/privacy}","received_events_url":"https://api.github.com/users/MSFTOSSMgmt/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/MSFTOSSMgmt/bld-omsagent","description":"Build projects required for omsagent","fork":false,"url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent","forks_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/forks","keys_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/keys{/key_id}","collaborators_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/teams","hooks_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/hooks","issue_events_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/issues/events{/number}","events_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/events","assignees_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/assignees{/user}","branches_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/branches{/branch}","tags_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/tags","blobs_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/git/refs{/sha}","trees_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/git/trees{/sha}","statuses_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/statuses/{sha}","languages_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/languages","stargazers_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/stargazers","contributors_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/contributors","subscribers_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/subscribers","subscription_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/subscription","commits_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/commits{/sha}","git_commits_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/git/commits{/sha}","comments_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/comments{/number}","issue_comment_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/issues/comments{/number}","contents_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/contents/{+path}","compare_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/compare/{base}...{head}","merges_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/merges","archive_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/downloads","issues_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/issues{/number}","pulls_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls{/number}","milestones_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/milestones{/number}","notifications_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/labels{/name}","releases_url":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/releases{/id}","created_at":"2015-11-23T21:51:08Z","updated_at":"2015-12-04T09:54:28Z","pushed_at":"2015-12-04T17:10:46Z","git_url":"git://github.com/MSFTOSSMgmt/bld-omsagent.git","ssh_url":"git@github.com:MSFTOSSMgmt/bld-omsagent.git","clone_url":"https://github.com/MSFTOSSMgmt/bld-omsagent.git","svn_url":"https://github.com/MSFTOSSMgmt/bld-omsagent","homepage":null,"size":20,"stargazers_count":1,"watchers_count":1,"language":"Shell","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/7"},"html":{"href":"https://github.com/MSFTOSSMgmt/bld-omsagent/pull/7"},"issue":{"href":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/issues/7"},"comments":{"href":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/issues/7/comments"},"review_comments":{"href":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/7/comments"},"review_comment":{"href":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/pulls/7/commits"},"statuses":{"href":"https://api.github.com/repos/MSFTOSSMgmt/bld-omsagent/statuses/3e29e95a5dd8df2f8842f389e09fb1c4b131e994"}}}}