GitHub PullRequestEvent at 2014-02-25 14:33:53
Repository: ggplot2
Actor: hadley
Payload: {"action":"closed","number":913,"pull_request":{"url":"https://api.github.com/repos/hadley/ggplot2/pulls/913","id":12903797,"html_url":"https://github.com/hadley/ggplot2/pull/913","diff_url":"https://github.com/hadley/ggplot2/pull/913.diff","patch_url":"https://github.com/hadley/ggplot2/pull/913.patch","issue_url":"https://api.github.com/repos/hadley/ggplot2/issues/913","number":913,"state":"closed","title":"Avoid merge conflicts in NEWS file","user":{"login":"krlmlr","id":1741643,"avatar_url":"https://gravatar.com/avatar/a41bd8dee1c9de17d915bffb43e74b7d?d=https%3A%2F%2Fidenticons.github.com%2Fba900d07e0283a9fdac6c43081b3ab9d.png&r=x","gravatar_id":"a41bd8dee1c9de17d915bffb43e74b7d","url":"https://api.github.com/users/krlmlr","html_url":"https://github.com/krlmlr","followers_url":"https://api.github.com/users/krlmlr/followers","following_url":"https://api.github.com/users/krlmlr/following{/other_user}","gists_url":"https://api.github.com/users/krlmlr/gists{/gist_id}","starred_url":"https://api.github.com/users/krlmlr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/krlmlr/subscriptions","organizations_url":"https://api.github.com/users/krlmlr/orgs","repos_url":"https://api.github.com/users/krlmlr/repos","events_url":"https://api.github.com/users/krlmlr/events{/privacy}","received_events_url":"https://api.github.com/users/krlmlr/received_events","type":"User","site_admin":false},"body":"by using the `union` merge strategy.\n\nThis will simplify life for contributors. Unfortunately, GitHub does not seem to support this for browser-based merging, but merges on the command line will not suffer from merge conflicts in `NEWS` anymore.\n\nSee also http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/.","created_at":"2014-02-25T14:10:29Z","updated_at":"2014-02-25T14:33:53Z","closed_at":"2014-02-25T14:33:53Z","merged_at":"2014-02-25T14:33:53Z","merge_commit_sha":"c5ea1ed4591107d2898764de32cccc2190122052","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/hadley/ggplot2/pulls/913/commits","review_comments_url":"https://api.github.com/repos/hadley/ggplot2/pulls/913/comments","review_comment_url":"https://api.github.com/repos/hadley/ggplot2/pulls/comments/{number}","comments_url":"https://api.github.com/repos/hadley/ggplot2/issues/913/comments","statuses_url":"https://api.github.com/repos/hadley/ggplot2/statuses/3aeaa1f76eb47b5300f390b20258dd28aaab5986","head":{"label":"krlmlr:gitattributes-NEWS","ref":"gitattributes-NEWS","sha":"3aeaa1f76eb47b5300f390b20258dd28aaab5986","user":{"login":"krlmlr","id":1741643,"avatar_url":"https://gravatar.com/avatar/a41bd8dee1c9de17d915bffb43e74b7d?d=https%3A%2F%2Fidenticons.github.com%2Fba900d07e0283a9fdac6c43081b3ab9d.png&r=x","gravatar_id":"a41bd8dee1c9de17d915bffb43e74b7d","url":"https://api.github.com/users/krlmlr","html_url":"https://github.com/krlmlr","followers_url":"https://api.github.com/users/krlmlr/followers","following_url":"https://api.github.com/users/krlmlr/following{/other_user}","gists_url":"https://api.github.com/users/krlmlr/gists{/gist_id}","starred_url":"https://api.github.com/users/krlmlr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/krlmlr/subscriptions","organizations_url":"https://api.github.com/users/krlmlr/orgs","repos_url":"https://api.github.com/users/krlmlr/repos","events_url":"https://api.github.com/users/krlmlr/events{/privacy}","received_events_url":"https://api.github.com/users/krlmlr/received_events","type":"User","site_admin":false},"repo":{"id":11127171,"name":"ggplot2","full_name":"krlmlr/ggplot2","owner":{"login":"krlmlr","id":1741643,"avatar_url":"https://gravatar.com/avatar/a41bd8dee1c9de17d915bffb43e74b7d?d=https%3A%2F%2Fidenticons.github.com%2Fba900d07e0283a9fdac6c43081b3ab9d.png&r=x","gravatar_id":"a41bd8dee1c9de17d915bffb43e74b7d","url":"https://api.github.com/users/krlmlr","html_url":"https://github.com/krlmlr","followers_url":"https://api.github.com/users/krlmlr/followers","following_url":"https://api.github.com/users/krlmlr/following{/other_user}","gists_url":"https://api.github.com/users/krlmlr/gists{/gist_id}","starred_url":"https://api.github.com/users/krlmlr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/krlmlr/subscriptions","organizations_url":"https://api.github.com/users/krlmlr/orgs","repos_url":"https://api.github.com/users/krlmlr/repos","events_url":"https://api.github.com/users/krlmlr/events{/privacy}","received_events_url":"https://api.github.com/users/krlmlr/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/krlmlr/ggplot2","description":"An implementation of the Grammar of Graphics in R","fork":true,"url":"https://api.github.com/repos/krlmlr/ggplot2","forks_url":"https://api.github.com/repos/krlmlr/ggplot2/forks","keys_url":"https://api.github.com/repos/krlmlr/ggplot2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/krlmlr/ggplot2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/krlmlr/ggplot2/teams","hooks_url":"https://api.github.com/repos/krlmlr/ggplot2/hooks","issue_events_url":"https://api.github.com/repos/krlmlr/ggplot2/issues/events{/number}","events_url":"https://api.github.com/repos/krlmlr/ggplot2/events","assignees_url":"https://api.github.com/repos/krlmlr/ggplot2/assignees{/user}","branches_url":"https://api.github.com/repos/krlmlr/ggplot2/branches{/branch}","tags_url":"https://api.github.com/repos/krlmlr/ggplot2/tags","blobs_url":"https://api.github.com/repos/krlmlr/ggplot2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/krlmlr/ggplot2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/krlmlr/ggplot2/git/refs{/sha}","trees_url":"https://api.github.com/repos/krlmlr/ggplot2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/krlmlr/ggplot2/statuses/{sha}","languages_url":"https://api.github.com/repos/krlmlr/ggplot2/languages","stargazers_url":"https://api.github.com/repos/krlmlr/ggplot2/stargazers","contributors_url":"https://api.github.com/repos/krlmlr/ggplot2/contributors","subscribers_url":"https://api.github.com/repos/krlmlr/ggplot2/subscribers","subscription_url":"https://api.github.com/repos/krlmlr/ggplot2/subscription","commits_url":"https://api.github.com/repos/krlmlr/ggplot2/commits{/sha}","git_commits_url":"https://api.github.com/repos/krlmlr/ggplot2/git/commits{/sha}","comments_url":"https://api.github.com/repos/krlmlr/ggplot2/comments{/number}","issue_comment_url":"https://api.github.com/repos/krlmlr/ggplot2/issues/comments/{number}","contents_url":"https://api.github.com/repos/krlmlr/ggplot2/contents/{+path}","compare_url":"https://api.github.com/repos/krlmlr/ggplot2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/krlmlr/ggplot2/merges","archive_url":"https://api.github.com/repos/krlmlr/ggplot2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/krlmlr/ggplot2/downloads","issues_url":"https://api.github.com/repos/krlmlr/ggplot2/issues{/number}","pulls_url":"https://api.github.com/repos/krlmlr/ggplot2/pulls{/number}","milestones_url":"https://api.github.com/repos/krlmlr/ggplot2/milestones{/number}","notifications_url":"https://api.github.com/repos/krlmlr/ggplot2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/krlmlr/ggplot2/labels{/name}","releases_url":"https://api.github.com/repos/krlmlr/ggplot2/releases{/id}","created_at":"2013-07-02T14:53:09Z","updated_at":"2014-02-25T14:33:53Z","pushed_at":"2014-02-25T14:32:57Z","git_url":"git://github.com/krlmlr/ggplot2.git","ssh_url":"git@github.com:krlmlr/ggplot2.git","clone_url":"https://github.com/krlmlr/ggplot2.git","svn_url":"https://github.com/krlmlr/ggplot2","homepage":"http://had.co.nz/ggplot2","size":16628,"stargazers_count":0,"watchers_count":0,"language":"R","has_issues":false,"has_downloads":true,"has_wiki":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master","master_branch":"master"}},"base":{"label":"hadley:master","ref":"master","sha":"1da88f3e644ea3ea42618f872bbd7e8ba08accba","user":{"login":"hadley","id":4196,"avatar_url":"https://gravatar.com/avatar/7ba164f40a50bc23dbb2aa825fb7bc16?d=https%3A%2F%2Fidenticons.github.com%2F0fd4b8a8354a77a3fa75e3d97e7a34e6.png&r=x","gravatar_id":"7ba164f40a50bc23dbb2aa825fb7bc16","url":"https://api.github.com/users/hadley","html_url":"https://github.com/hadley","followers_url":"https://api.github.com/users/hadley/followers","following_url":"https://api.github.com/users/hadley/following{/other_user}","gists_url":"https://api.github.com/users/hadley/gists{/gist_id}","starred_url":"https://api.github.com/users/hadley/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hadley/subscriptions","organizations_url":"https://api.github.com/users/hadley/orgs","repos_url":"https://api.github.com/users/hadley/repos","events_url":"https://api.github.com/users/hadley/events{/privacy}","received_events_url":"https://api.github.com/users/hadley/received_events","type":"User","site_admin":false},"repo":{"id":19438,"name":"ggplot2","full_name":"hadley/ggplot2","owner":{"login":"hadley","id":4196,"avatar_url":"https://gravatar.com/avatar/7ba164f40a50bc23dbb2aa825fb7bc16?d=https%3A%2F%2Fidenticons.github.com%2F0fd4b8a8354a77a3fa75e3d97e7a34e6.png&r=x","gravatar_id":"7ba164f40a50bc23dbb2aa825fb7bc16","url":"https://api.github.com/users/hadley","html_url":"https://github.com/hadley","followers_url":"https://api.github.com/users/hadley/followers","following_url":"https://api.github.com/users/hadley/following{/other_user}","gists_url":"https://api.github.com/users/hadley/gists{/gist_id}","starred_url":"https://api.github.com/users/hadley/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hadley/subscriptions","organizations_url":"https://api.github.com/users/hadley/orgs","repos_url":"https://api.github.com/users/hadley/repos","events_url":"https://api.github.com/users/hadley/events{/privacy}","received_events_url":"https://api.github.com/users/hadley/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/hadley/ggplot2","description":"An implementation of the Grammar of Graphics in R","fork":false,"url":"https://api.github.com/repos/hadley/ggplot2","forks_url":"https://api.github.com/repos/hadley/ggplot2/forks","keys_url":"https://api.github.com/repos/hadley/ggplot2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/hadley/ggplot2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/hadley/ggplot2/teams","hooks_url":"https://api.github.com/repos/hadley/ggplot2/hooks","issue_events_url":"https://api.github.com/repos/hadley/ggplot2/issues/events{/number}","events_url":"https://api.github.com/repos/hadley/ggplot2/events","assignees_url":"https://api.github.com/repos/hadley/ggplot2/assignees{/user}","branches_url":"https://api.github.com/repos/hadley/ggplot2/branches{/branch}","tags_url":"https://api.github.com/repos/hadley/ggplot2/tags","blobs_url":"https://api.github.com/repos/hadley/ggplot2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/hadley/ggplot2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/hadley/ggplot2/git/refs{/sha}","trees_url":"https://api.github.com/repos/hadley/ggplot2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/hadley/ggplot2/statuses/{sha}","languages_url":"https://api.github.com/repos/hadley/ggplot2/languages","stargazers_url":"https://api.github.com/repos/hadley/ggplot2/stargazers","contributors_url":"https://api.github.com/repos/hadley/ggplot2/contributors","subscribers_url":"https://api.github.com/repos/hadley/ggplot2/subscribers","subscription_url":"https://api.github.com/repos/hadley/ggplot2/subscription","commits_url":"https://api.github.com/repos/hadley/ggplot2/commits{/sha}","git_commits_url":"https://api.github.com/repos/hadley/ggplot2/git/commits{/sha}","comments_url":"https://api.github.com/repos/hadley/ggplot2/comments{/number}","issue_comment_url":"https://api.github.com/repos/hadley/ggplot2/issues/comments/{number}","contents_url":"https://api.github.com/repos/hadley/ggplot2/contents/{+path}","compare_url":"https://api.github.com/repos/hadley/ggplot2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/hadley/ggplot2/merges","archive_url":"https://api.github.com/repos/hadley/ggplot2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/hadley/ggplot2/downloads","issues_url":"https://api.github.com/repos/hadley/ggplot2/issues{/number}","pulls_url":"https://api.github.com/repos/hadley/ggplot2/pulls{/number}","milestones_url":"https://api.github.com/repos/hadley/ggplot2/milestones{/number}","notifications_url":"https://api.github.com/repos/hadley/ggplot2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/hadley/ggplot2/labels{/name}","releases_url":"https://api.github.com/repos/hadley/ggplot2/releases{/id}","created_at":"2008-05-25T01:21:32Z","updated_at":"2014-02-25T14:33:53Z","pushed_at":"2014-02-25T14:33:53Z","git_url":"git://github.com/hadley/ggplot2.git","ssh_url":"git@github.com:hadley/ggplot2.git","clone_url":"https://github.com/hadley/ggplot2.git","svn_url":"https://github.com/hadley/ggplot2","homepage":"http://ggplot2.org","size":24761,"stargazers_count":779,"watchers_count":779,"language":"R","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":158,"mirror_url":null,"open_issues_count":7,"forks":158,"open_issues":7,"watchers":779,"default_branch":"master","master_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/hadley/ggplot2/pulls/913"},"html":{"href":"https://github.com/hadley/ggplot2/pull/913"},"issue":{"href":"https://api.github.com/repos/hadley/ggplot2/issues/913"},"comments":{"href":"https://api.github.com/repos/hadley/ggplot2/issues/913/comments"},"review_comments":{"href":"https://api.github.com/repos/hadley/ggplot2/pulls/913/comments"},"review_comment":{"href":"https://api.github.com/repos/hadley/ggplot2/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/hadley/ggplot2/pulls/913/commits"},"statuses":{"href":"https://api.github.com/repos/hadley/ggplot2/statuses/3aeaa1f76eb47b5300f390b20258dd28aaab5986"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"hadley","id":4196,"avatar_url":"https://gravatar.com/avatar/7ba164f40a50bc23dbb2aa825fb7bc16?d=https%3A%2F%2Fidenticons.github.com%2F0fd4b8a8354a77a3fa75e3d97e7a34e6.png&r=x","gravatar_id":"7ba164f40a50bc23dbb2aa825fb7bc16","url":"https://api.github.com/users/hadley","html_url":"https://github.com/hadley","followers_url":"https://api.github.com/users/hadley/followers","following_url":"https://api.github.com/users/hadley/following{/other_user}","gists_url":"https://api.github.com/users/hadley/gists{/gist_id}","starred_url":"https://api.github.com/users/hadley/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hadley/subscriptions","organizations_url":"https://api.github.com/users/hadley/orgs","repos_url":"https://api.github.com/users/hadley/repos","events_url":"https://api.github.com/users/hadley/events{/privacy}","received_events_url":"https://api.github.com/users/hadley/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":1,"additions":2,"deletions":0,"changed_files":2}}