{"action":"opened","number":1277,"pull_request":{"url":"https://api.github.com/repos/ocaml/ocaml/pulls/1277","id":134848613,"html_url":"https://github.com/ocaml/ocaml/pull/1277","diff_url":"https://github.com/ocaml/ocaml/pull/1277.diff","patch_url":"https://github.com/ocaml/ocaml/pull/1277.patch","issue_url":"https://api.github.com/repos/ocaml/ocaml/issues/1277","number":1277,"state":"open","locked":false,"title":".gitattributes: disable the 'union' merge driver for Changes","user":{"login":"gasche","id":426238,"avatar_url":"https://avatars2.githubusercontent.com/u/426238?v=4","gravatar_id":"","url":"https://api.github.com/users/gasche","html_url":"https://github.com/gasche","followers_url":"https://api.github.com/users/gasche/followers","following_url":"https://api.github.com/users/gasche/following{/other_user}","gists_url":"https://api.github.com/users/gasche/gists{/gist_id}","starred_url":"https://api.github.com/users/gasche/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gasche/subscriptions","organizations_url":"https://api.github.com/users/gasche/orgs","repos_url":"https://api.github.com/users/gasche/repos","events_url":"https://api.github.com/users/gasche/events{/privacy}","received_events_url":"https://api.github.com/users/gasche/received_events","type":"User","site_admin":false},"body":"The 'union' merge driver silently duplicates lines instead of raising\r\na conflict, which turns out to be worse. Example of cleanup commits\r\ninclude:\r\n\r\n- e68642379dda54a1eb2f887b2dbe4192c686461e (#1267)\r\n- dade14d68373241f566c9f94a71d986de5cf8b6e (#1258)","created_at":"2017-08-09T09:31:12Z","updated_at":"2017-08-09T09:31:12Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/ocaml/ocaml/pulls/1277/commits","review_comments_url":"https://api.github.com/repos/ocaml/ocaml/pulls/1277/comments","review_comment_url":"https://api.github.com/repos/ocaml/ocaml/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ocaml/ocaml/issues/1277/comments","statuses_url":"https://api.github.com/repos/ocaml/ocaml/statuses/00ce21ac0b689c0e3903a4e35f86d1b99958dc38","head":{"label":"gasche:changes-cleanup","ref":"changes-cleanup","sha":"00ce21ac0b689c0e3903a4e35f86d1b99958dc38","user":{"login":"gasche","id":426238,"avatar_url":"https://avatars2.githubusercontent.com/u/426238?v=4","gravatar_id":"","url":"https://api.github.com/users/gasche","html_url":"https://github.com/gasche","followers_url":"https://api.github.com/users/gasche/followers","following_url":"https://api.github.com/users/gasche/following{/other_user}","gists_url":"https://api.github.com/users/gasche/gists{/gist_id}","starred_url":"https://api.github.com/users/gasche/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gasche/subscriptions","organizations_url":"https://api.github.com/users/gasche/orgs","repos_url":"https://api.github.com/users/gasche/repos","events_url":"https://api.github.com/users/gasche/events{/privacy}","received_events_url":"https://api.github.com/users/gasche/received_events","type":"User","site_admin":false},"repo":{"id":18431480,"name":"ocaml","full_name":"gasche/ocaml","owner":{"login":"gasche","id":426238,"avatar_url":"https://avatars2.githubusercontent.com/u/426238?v=4","gravatar_id":"","url":"https://api.github.com/users/gasche","html_url":"https://github.com/gasche","followers_url":"https://api.github.com/users/gasche/followers","following_url":"https://api.github.com/users/gasche/following{/other_user}","gists_url":"https://api.github.com/users/gasche/gists{/gist_id}","starred_url":"https://api.github.com/users/gasche/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gasche/subscriptions","organizations_url":"https://api.github.com/users/gasche/orgs","repos_url":"https://api.github.com/users/gasche/repos","events_url":"https://api.github.com/users/gasche/events{/privacy}","received_events_url":"https://api.github.com/users/gasche/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/gasche/ocaml","description":" The core OCaml system: compilers, runtime system, base libraries ","fork":true,"url":"https://api.github.com/repos/gasche/ocaml","forks_url":"https://api.github.com/repos/gasche/ocaml/forks","keys_url":"https://api.github.com/repos/gasche/ocaml/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gasche/ocaml/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gasche/ocaml/teams","hooks_url":"https://api.github.com/repos/gasche/ocaml/hooks","issue_events_url":"https://api.github.com/repos/gasche/ocaml/issues/events{/number}","events_url":"https://api.github.com/repos/gasche/ocaml/events","assignees_url":"https://api.github.com/repos/gasche/ocaml/assignees{/user}","branches_url":"https://api.github.com/repos/gasche/ocaml/branches{/branch}","tags_url":"https://api.github.com/repos/gasche/ocaml/tags","blobs_url":"https://api.github.com/repos/gasche/ocaml/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gasche/ocaml/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gasche/ocaml/git/refs{/sha}","trees_url":"https://api.github.com/repos/gasche/ocaml/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gasche/ocaml/statuses/{sha}","languages_url":"https://api.github.com/repos/gasche/ocaml/languages","stargazers_url":"https://api.github.com/repos/gasche/ocaml/stargazers","contributors_url":"https://api.github.com/repos/gasche/ocaml/contributors","subscribers_url":"https://api.github.com/repos/gasche/ocaml/subscribers","subscription_url":"https://api.github.com/repos/gasche/ocaml/subscription","commits_url":"https://api.github.com/repos/gasche/ocaml/commits{/sha}","git_commits_url":"https://api.github.com/repos/gasche/ocaml/git/commits{/sha}","comments_url":"https://api.github.com/repos/gasche/ocaml/comments{/number}","issue_comment_url":"https://api.github.com/repos/gasche/ocaml/issues/comments{/number}","contents_url":"https://api.github.com/repos/gasche/ocaml/contents/{+path}","compare_url":"https://api.github.com/repos/gasche/ocaml/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gasche/ocaml/merges","archive_url":"https://api.github.com/repos/gasche/ocaml/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gasche/ocaml/downloads","issues_url":"https://api.github.com/repos/gasche/ocaml/issues{/number}","pulls_url":"https://api.github.com/repos/gasche/ocaml/pulls{/number}","milestones_url":"https://api.github.com/repos/gasche/ocaml/milestones{/number}","notifications_url":"https://api.github.com/repos/gasche/ocaml/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gasche/ocaml/labels{/name}","releases_url":"https://api.github.com/repos/gasche/ocaml/releases{/id}","deployments_url":"https://api.github.com/repos/gasche/ocaml/deployments","created_at":"2014-04-04T07:49:39Z","updated_at":"2016-12-29T14:16:54Z","pushed_at":"2017-08-09T07:21:30Z","git_url":"git://github.com/gasche/ocaml.git","ssh_url":"git@github.com:gasche/ocaml.git","clone_url":"https://github.com/gasche/ocaml.git","svn_url":"https://github.com/gasche/ocaml","homepage":"","size":164408,"stargazers_count":0,"watchers_count":0,"language":"OCaml","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"trunk"}},"base":{"label":"ocaml:trunk","ref":"trunk","sha":"110b1c24de32fbfbee90f3ee392bc1b610de53f5","user":{"login":"ocaml","id":1841483,"avatar_url":"https://avatars3.githubusercontent.com/u/1841483?v=4","gravatar_id":"","url":"https://api.github.com/users/ocaml","html_url":"https://github.com/ocaml","followers_url":"https://api.github.com/users/ocaml/followers","following_url":"https://api.github.com/users/ocaml/following{/other_user}","gists_url":"https://api.github.com/users/ocaml/gists{/gist_id}","starred_url":"https://api.github.com/users/ocaml/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ocaml/subscriptions","organizations_url":"https://api.github.com/users/ocaml/orgs","repos_url":"https://api.github.com/users/ocaml/repos","events_url":"https://api.github.com/users/ocaml/events{/privacy}","received_events_url":"https://api.github.com/users/ocaml/received_events","type":"Organization","site_admin":false},"repo":{"id":6786166,"name":"ocaml","full_name":"ocaml/ocaml","owner":{"login":"ocaml","id":1841483,"avatar_url":"https://avatars3.githubusercontent.com/u/1841483?v=4","gravatar_id":"","url":"https://api.github.com/users/ocaml","html_url":"https://github.com/ocaml","followers_url":"https://api.github.com/users/ocaml/followers","following_url":"https://api.github.com/users/ocaml/following{/other_user}","gists_url":"https://api.github.com/users/ocaml/gists{/gist_id}","starred_url":"https://api.github.com/users/ocaml/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ocaml/subscriptions","organizations_url":"https://api.github.com/users/ocaml/orgs","repos_url":"https://api.github.com/users/ocaml/repos","events_url":"https://api.github.com/users/ocaml/events{/privacy}","received_events_url":"https://api.github.com/users/ocaml/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/ocaml/ocaml","description":"The core OCaml system: compilers, runtime system, base libraries","fork":false,"url":"https://api.github.com/repos/ocaml/ocaml","forks_url":"https://api.github.com/repos/ocaml/ocaml/forks","keys_url":"https://api.github.com/repos/ocaml/ocaml/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ocaml/ocaml/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ocaml/ocaml/teams","hooks_url":"https://api.github.com/repos/ocaml/ocaml/hooks","issue_events_url":"https://api.github.com/repos/ocaml/ocaml/issues/events{/number}","events_url":"https://api.github.com/repos/ocaml/ocaml/events","assignees_url":"https://api.github.com/repos/ocaml/ocaml/assignees{/user}","branches_url":"https://api.github.com/repos/ocaml/ocaml/branches{/branch}","tags_url":"https://api.github.com/repos/ocaml/ocaml/tags","blobs_url":"https://api.github.com/repos/ocaml/ocaml/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ocaml/ocaml/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ocaml/ocaml/git/refs{/sha}","trees_url":"https://api.github.com/repos/ocaml/ocaml/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ocaml/ocaml/statuses/{sha}","languages_url":"https://api.github.com/repos/ocaml/ocaml/languages","stargazers_url":"https://api.github.com/repos/ocaml/ocaml/stargazers","contributors_url":"https://api.github.com/repos/ocaml/ocaml/contributors","subscribers_url":"https://api.github.com/repos/ocaml/ocaml/subscribers","subscription_url":"https://api.github.com/repos/ocaml/ocaml/subscription","commits_url":"https://api.github.com/repos/ocaml/ocaml/commits{/sha}","git_commits_url":"https://api.github.com/repos/ocaml/ocaml/git/commits{/sha}","comments_url":"https://api.github.com/repos/ocaml/ocaml/comments{/number}","issue_comment_url":"https://api.github.com/repos/ocaml/ocaml/issues/comments{/number}","contents_url":"https://api.github.com/repos/ocaml/ocaml/contents/{+path}","compare_url":"https://api.github.com/repos/ocaml/ocaml/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ocaml/ocaml/merges","archive_url":"https://api.github.com/repos/ocaml/ocaml/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ocaml/ocaml/downloads","issues_url":"https://api.github.com/repos/ocaml/ocaml/issues{/number}","pulls_url":"https://api.github.com/repos/ocaml/ocaml/pulls{/number}","milestones_url":"https://api.github.com/repos/ocaml/ocaml/milestones{/number}","notifications_url":"https://api.github.com/repos/ocaml/ocaml/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ocaml/ocaml/labels{/name}","releases_url":"https://api.github.com/repos/ocaml/ocaml/releases{/id}","deployments_url":"https://api.github.com/repos/ocaml/ocaml/deployments","created_at":"2012-11-20T22:18:22Z","updated_at":"2017-08-09T02:15:56Z","pushed_at":"2017-08-09T09:28:47Z","git_url":"git://github.com/ocaml/ocaml.git","ssh_url":"git@github.com:ocaml/ocaml.git","clone_url":"https://github.com/ocaml/ocaml.git","svn_url":"https://github.com/ocaml/ocaml","homepage":"","size":145669,"stargazers_count":1397,"watchers_count":1397,"language":"OCaml","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":388,"mirror_url":null,"open_issues_count":136,"forks":388,"open_issues":136,"watchers":1397,"default_branch":"trunk"}},"_links":{"self":{"href":"https://api.github.com/repos/ocaml/ocaml/pulls/1277"},"html":{"href":"https://github.com/ocaml/ocaml/pull/1277"},"issue":{"href":"https://api.github.com/repos/ocaml/ocaml/issues/1277"},"comments":{"href":"https://api.github.com/repos/ocaml/ocaml/issues/1277/comments"},"review_comments":{"href":"https://api.github.com/repos/ocaml/ocaml/pulls/1277/comments"},"review_comment":{"href":"https://api.github.com/repos/ocaml/ocaml/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ocaml/ocaml/pulls/1277/commits"},"statuses":{"href":"https://api.github.com/repos/ocaml/ocaml/statuses/00ce21ac0b689c0e3903a4e35f86d1b99958dc38"}},"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":true,"commits":1,"additions":6,"deletions":1,"changed_files":1}}
{"actor":{"display_login":"gasche"}}