{"action":"created","comment":{"url":"https://api.github.com/repos/attic-labs/noms/pulls/comments/75413481","id":75413481,"diff_hunk":"@@ -0,0 +1,259 @@\n+// Copyright 2016 Attic Labs, Inc. All rights reserved.\n+// Licensed under the Apache License, version 2.0:\n+// http://www.apache.org/licenses/LICENSE-2.0\n+\n+package merge\n+\n+import (\n+\t\"fmt\"\n+\n+\t\"github.com/attic-labs/noms/go/d\"\n+\t\"github.com/attic-labs/noms/go/types\"\n+)\n+\n+// ErrMergeConflict indicates that a merge attempt failed and must be resolved manually for the provided reason.\n+type ErrMergeConflict struct {\n+\tmsg string\n+}\n+\n+func (e *ErrMergeConflict) Error() string {\n+\treturn e.msg\n+}\n+\n+func newMergeConflict(format string, args ...interface{}) *ErrMergeConflict {\n+\treturn &ErrMergeConflict{fmt.Sprintf(format, args...)}\n+}\n+\n+// ThreeWay() attempts a three-way merge between two candidates and a common ancestor. It considers the three of them recursively, applying some simple rules to identify conflicts:\n+//  - If any of the three nodes are different types: conflict\n+//  - If we are dealing with a map:\n+//    - If the same key is both removed and inserted wrt parent: conflict\n+//    - If the same key is inserted wrt parent, but with different values: conflict\n+//  - If we are dealing with a struct:\n+//    - If the same field is both removed and inserted wrt parent: conflict\n+//    - If the same field is inserted wrt parent, but with different values: conflict\n+//  - If we are dealing with a list:\n+//    - If the same index is both removed and inserted wrt parent: conflict\n+//    - If the same index is inserted wrt parent, but with different values: conflict\n+//  - If we are dealing with a set:\n+//    - If the same object is both removed and inserted wrt parent: conflict\n+//\n+// All other modifications are allowed.\n+// Currently, ThreeWay() only works on types.Map.\n+func ThreeWay(a, b, parent types.Value, vwr types.ValueReadWriter) (merged types.Value, err error) {\n+\tif a == nil && b == nil {\n+\t\treturn parent, nil\n+\t} else if a == nil {\n+\t\treturn parent, newMergeConflict(\"Cannot merge nil Value with %s.\", b.Type().Describe())\n+\t} else if b == nil {\n+\t\treturn parent, newMergeConflict(\"Cannot merge %s with nil value.\", a.Type().Describe())\n+\t} else if unmergeable(a, b) {\n+\t\treturn parent, newMergeConflict(\"Cannot merge %s with %s.\", a.Type().Describe(), b.Type().Describe())\n+\t}\n+\n+\treturn threeWayMerge(a, b, parent, vwr)\n+}\n+\n+// a and b cannot be merged if they are of different NomsKind, or if at least one of the two is nil, or if either is a Noms primitive.\n+func unmergeable(a, b types.Value) bool {\n+\tif a != nil && b != nil {\n+\t\taKind, bKind := a.Type().Kind(), b.Type().Kind()\n+\t\treturn aKind != bKind || types.IsPrimitiveKind(aKind) || types.IsPrimitiveKind(bKind)\n+\t}\n+\treturn true\n+}\n+\n+func threeWayMerge(a, b, parent types.Value, vwr types.ValueReadWriter) (merged types.Value, err error) {\n+\td.PanicIfTrue(a == nil || b == nil, \"Merge candidates cannont be nil: a = %v, b = %v\", a, b)\n+\tnewTypeConflict := func() *ErrMergeConflict {\n+\t\tpDescription := \"<nil>\"\n+\t\tif parent != nil {\n+\t\t\tpDescription = parent.Type().Describe()\n+\t\t}\n+\t\treturn newMergeConflict(\"Cannot merge %s and %s on top of %s.\", a.Type().Describe(), b.Type().Describe(), pDescription)\n+\t}\n+\n+\tswitch a.Type().Kind() {\n+\tdefault:\n+\t\treturn parent, newMergeConflict(\"Cannot merge %s.\", a.Type().Describe())\n+\n+\tcase types.ListKind:\n+\t\t// TODO: Come up with a plan for List (BUG 148)\n+\t\treturn parent, newMergeConflict(\"Cannot merge %s.\", a.Type().Describe())\n+\n+\tcase types.MapKind:\n+\t\tif aMap, bMap, pMap, ok := mapAssert(a, b, parent); ok {\n+\t\t\treturn threeWayMapMerge(aMap, bMap, pMap, vwr)\n+\t\t}\n+\n+\tcase types.RefKind:\n+\t\tif aValue, bValue, pValue, ok := refAssert(a, b, parent, vwr); ok {\n+\t\t\tmerged, err := threeWayMerge(aValue, bValue, pValue, vwr)\n+\t\t\tif err != nil {\n+\t\t\t\treturn parent, err\n+\t\t\t}\n+\t\t\treturn vwr.WriteValue(merged), nil\n+\t\t}\n+\n+\tcase types.SetKind:\n+\t\t// TODO: Implement plan from BUG148\n+\t\treturn parent, newMergeConflict(\"Cannot merge %s.\", a.Type().Describe())\n+\n+\tcase types.StructKind:\n+\t\tif aStruct, bStruct, pStruct, ok := structAssert(a, b, parent); ok {\n+\t\t\treturn threeWayStructMerge(aStruct, bStruct, pStruct, vwr)\n+\t\t}\n+\n+\t}\n+\treturn parent, newTypeConflict()\n+}\n+\n+func threeWayMapMerge(a, b, parent types.Map, vwr types.ValueReadWriter) (merged types.Map, err error) {\n+\taChangeChan, bChangeChan := make(chan types.ValueChanged), make(chan types.ValueChanged)\n+\taStopChan, bStopChan := make(chan struct{}, 1), make(chan struct{}, 1)\n+\n+\tgo func() {\n+\t\ta.DiffLeftRight(parent, aChangeChan, aStopChan)\n+\t\tclose(aChangeChan)\n+\t}()\n+\tgo func() {\n+\t\tb.DiffLeftRight(parent, bChangeChan, bStopChan)\n+\t\tclose(bChangeChan)\n+\t}()\n+\tstopAndDrain := func(stop chan<- struct{}, drain <-chan types.ValueChanged) {\n+\t\tclose(stop)\n+\t\tfor _ = range drain {","path":"go/merge/three_way.go","position":125,"original_position":125,"commit_id":"47abff40a10fa686ead91d7c32d6b12329487af1","original_commit_id":"47abff40a10fa686ead91d7c32d6b12329487af1","user":{"login":"kalman","id":657134,"avatar_url":"https://avatars.githubusercontent.com/u/657134?v=3","gravatar_id":"","url":"https://api.github.com/users/kalman","html_url":"https://github.com/kalman","followers_url":"https://api.github.com/users/kalman/followers","following_url":"https://api.github.com/users/kalman/following{/other_user}","gists_url":"https://api.github.com/users/kalman/gists{/gist_id}","starred_url":"https://api.github.com/users/kalman/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kalman/subscriptions","organizations_url":"https://api.github.com/users/kalman/orgs","repos_url":"https://api.github.com/users/kalman/repos","events_url":"https://api.github.com/users/kalman/events{/privacy}","received_events_url":"https://api.github.com/users/kalman/received_events","type":"User","site_admin":false},"body":"just `for range drain`","created_at":"2016-08-19T00:47:53Z","updated_at":"2016-08-19T00:47:53Z","html_url":"https://github.com/attic-labs/noms/pull/2388#discussion_r75413481","pull_request_url":"https://api.github.com/repos/attic-labs/noms/pulls/2388","_links":{"self":{"href":"https://api.github.com/repos/attic-labs/noms/pulls/comments/75413481"},"html":{"href":"https://github.com/attic-labs/noms/pull/2388#discussion_r75413481"},"pull_request":{"href":"https://api.github.com/repos/attic-labs/noms/pulls/2388"}}},"pull_request":{"url":"https://api.github.com/repos/attic-labs/noms/pulls/2388","id":81889960,"html_url":"https://github.com/attic-labs/noms/pull/2388","diff_url":"https://github.com/attic-labs/noms/pull/2388.diff","patch_url":"https://github.com/attic-labs/noms/pull/2388.patch","issue_url":"https://api.github.com/repos/attic-labs/noms/issues/2388","number":2388,"state":"open","locked":false,"title":"Go: Implement best-effort three-way merge for Maps","user":{"login":"cmasone-attic","id":13224090,"avatar_url":"https://avatars.githubusercontent.com/u/13224090?v=3","gravatar_id":"","url":"https://api.github.com/users/cmasone-attic","html_url":"https://github.com/cmasone-attic","followers_url":"https://api.github.com/users/cmasone-attic/followers","following_url":"https://api.github.com/users/cmasone-attic/following{/other_user}","gists_url":"https://api.github.com/users/cmasone-attic/gists{/gist_id}","starred_url":"https://api.github.com/users/cmasone-attic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cmasone-attic/subscriptions","organizations_url":"https://api.github.com/users/cmasone-attic/orgs","repos_url":"https://api.github.com/users/cmasone-attic/repos","events_url":"https://api.github.com/users/cmasone-attic/events{/privacy}","received_events_url":"https://api.github.com/users/cmasone-attic/received_events","type":"User","site_admin":false},"body":"Add the Go 'merge' package, which exports one function called ThreeWay().\r\nThreeWay() attempts a three-way merge between two candidates and a common\r\nancestor. It considers the three of them recursively, applying some simple rules:\r\n\r\n- If any of the three nodes are different types: conflict\r\n- If we are dealing with a map:\r\n  - If the same key is both removed and inserted wrt parent: conflict\r\n  - If the same key is inserted wrt parent, but with different values: conflict\r\n- If we are dealing with a struct:\r\n  - same as map\r\n- If we are dealing with a list:\r\n  - Same as map but substitute \"index\" for \"key\"\r\n- If we are dealing with a set:\r\n  - If the same object is both removed and inserted wrt parent: conflict\r\n... otherwise, the concurrent modification is allowed.\r\n\r\nCurrently, ThreeWay() only works on types.Map.\r\n\r\nTowards #148","created_at":"2016-08-18T21:17:41Z","updated_at":"2016-08-19T00:47:53Z","closed_at":null,"merged_at":null,"merge_commit_sha":"131b88b9fd67d323011a791e94140d435282c383","assignee":{"login":"kalman","id":657134,"avatar_url":"https://avatars.githubusercontent.com/u/657134?v=3","gravatar_id":"","url":"https://api.github.com/users/kalman","html_url":"https://github.com/kalman","followers_url":"https://api.github.com/users/kalman/followers","following_url":"https://api.github.com/users/kalman/following{/other_user}","gists_url":"https://api.github.com/users/kalman/gists{/gist_id}","starred_url":"https://api.github.com/users/kalman/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kalman/subscriptions","organizations_url":"https://api.github.com/users/kalman/orgs","repos_url":"https://api.github.com/users/kalman/repos","events_url":"https://api.github.com/users/kalman/events{/privacy}","received_events_url":"https://api.github.com/users/kalman/received_events","type":"User","site_admin":false},"assignees":[{"login":"kalman","id":657134,"avatar_url":"https://avatars.githubusercontent.com/u/657134?v=3","gravatar_id":"","url":"https://api.github.com/users/kalman","html_url":"https://github.com/kalman","followers_url":"https://api.github.com/users/kalman/followers","following_url":"https://api.github.com/users/kalman/following{/other_user}","gists_url":"https://api.github.com/users/kalman/gists{/gist_id}","starred_url":"https://api.github.com/users/kalman/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kalman/subscriptions","organizations_url":"https://api.github.com/users/kalman/orgs","repos_url":"https://api.github.com/users/kalman/repos","events_url":"https://api.github.com/users/kalman/events{/privacy}","received_events_url":"https://api.github.com/users/kalman/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/attic-labs/noms/pulls/2388/commits","review_comments_url":"https://api.github.com/repos/attic-labs/noms/pulls/2388/comments","review_comment_url":"https://api.github.com/repos/attic-labs/noms/pulls/comments{/number}","comments_url":"https://api.github.com/repos/attic-labs/noms/issues/2388/comments","statuses_url":"https://api.github.com/repos/attic-labs/noms/statuses/47abff40a10fa686ead91d7c32d6b12329487af1","head":{"label":"cmasone-attic:issue148","ref":"issue148","sha":"47abff40a10fa686ead91d7c32d6b12329487af1","user":{"login":"cmasone-attic","id":13224090,"avatar_url":"https://avatars.githubusercontent.com/u/13224090?v=3","gravatar_id":"","url":"https://api.github.com/users/cmasone-attic","html_url":"https://github.com/cmasone-attic","followers_url":"https://api.github.com/users/cmasone-attic/followers","following_url":"https://api.github.com/users/cmasone-attic/following{/other_user}","gists_url":"https://api.github.com/users/cmasone-attic/gists{/gist_id}","starred_url":"https://api.github.com/users/cmasone-attic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cmasone-attic/subscriptions","organizations_url":"https://api.github.com/users/cmasone-attic/orgs","repos_url":"https://api.github.com/users/cmasone-attic/repos","events_url":"https://api.github.com/users/cmasone-attic/events{/privacy}","received_events_url":"https://api.github.com/users/cmasone-attic/received_events","type":"User","site_admin":false},"repo":{"id":64776588,"name":"noms","full_name":"cmasone-attic/noms","owner":{"login":"cmasone-attic","id":13224090,"avatar_url":"https://avatars.githubusercontent.com/u/13224090?v=3","gravatar_id":"","url":"https://api.github.com/users/cmasone-attic","html_url":"https://github.com/cmasone-attic","followers_url":"https://api.github.com/users/cmasone-attic/followers","following_url":"https://api.github.com/users/cmasone-attic/following{/other_user}","gists_url":"https://api.github.com/users/cmasone-attic/gists{/gist_id}","starred_url":"https://api.github.com/users/cmasone-attic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cmasone-attic/subscriptions","organizations_url":"https://api.github.com/users/cmasone-attic/orgs","repos_url":"https://api.github.com/users/cmasone-attic/repos","events_url":"https://api.github.com/users/cmasone-attic/events{/privacy}","received_events_url":"https://api.github.com/users/cmasone-attic/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/cmasone-attic/noms","description":"The versioned, forkable, syncable database","fork":true,"url":"https://api.github.com/repos/cmasone-attic/noms","forks_url":"https://api.github.com/repos/cmasone-attic/noms/forks","keys_url":"https://api.github.com/repos/cmasone-attic/noms/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cmasone-attic/noms/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cmasone-attic/noms/teams","hooks_url":"https://api.github.com/repos/cmasone-attic/noms/hooks","issue_events_url":"https://api.github.com/repos/cmasone-attic/noms/issues/events{/number}","events_url":"https://api.github.com/repos/cmasone-attic/noms/events","assignees_url":"https://api.github.com/repos/cmasone-attic/noms/assignees{/user}","branches_url":"https://api.github.com/repos/cmasone-attic/noms/branches{/branch}","tags_url":"https://api.github.com/repos/cmasone-attic/noms/tags","blobs_url":"https://api.github.com/repos/cmasone-attic/noms/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cmasone-attic/noms/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cmasone-attic/noms/git/refs{/sha}","trees_url":"https://api.github.com/repos/cmasone-attic/noms/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cmasone-attic/noms/statuses/{sha}","languages_url":"https://api.github.com/repos/cmasone-attic/noms/languages","stargazers_url":"https://api.github.com/repos/cmasone-attic/noms/stargazers","contributors_url":"https://api.github.com/repos/cmasone-attic/noms/contributors","subscribers_url":"https://api.github.com/repos/cmasone-attic/noms/subscribers","subscription_url":"https://api.github.com/repos/cmasone-attic/noms/subscription","commits_url":"https://api.github.com/repos/cmasone-attic/noms/commits{/sha}","git_commits_url":"https://api.github.com/repos/cmasone-attic/noms/git/commits{/sha}","comments_url":"https://api.github.com/repos/cmasone-attic/noms/comments{/number}","issue_comment_url":"https://api.github.com/repos/cmasone-attic/noms/issues/comments{/number}","contents_url":"https://api.github.com/repos/cmasone-attic/noms/contents/{+path}","compare_url":"https://api.github.com/repos/cmasone-attic/noms/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cmasone-attic/noms/merges","archive_url":"https://api.github.com/repos/cmasone-attic/noms/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cmasone-attic/noms/downloads","issues_url":"https://api.github.com/repos/cmasone-attic/noms/issues{/number}","pulls_url":"https://api.github.com/repos/cmasone-attic/noms/pulls{/number}","milestones_url":"https://api.github.com/repos/cmasone-attic/noms/milestones{/number}","notifications_url":"https://api.github.com/repos/cmasone-attic/noms/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cmasone-attic/noms/labels{/name}","releases_url":"https://api.github.com/repos/cmasone-attic/noms/releases{/id}","deployments_url":"https://api.github.com/repos/cmasone-attic/noms/deployments","created_at":"2016-08-02T17:13:26Z","updated_at":"2016-08-02T17:13:27Z","pushed_at":"2016-08-18T21:14:20Z","git_url":"git://github.com/cmasone-attic/noms.git","ssh_url":"git@github.com:cmasone-attic/noms.git","clone_url":"https://github.com/cmasone-attic/noms.git","svn_url":"https://github.com/cmasone-attic/noms","homepage":"","size":25243,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"attic-labs:master","ref":"master","sha":"15d80f9afda88813a8945ce7d2baa7929dbde88c","user":{"login":"attic-labs","id":12534679,"avatar_url":"https://avatars.githubusercontent.com/u/12534679?v=3","gravatar_id":"","url":"https://api.github.com/users/attic-labs","html_url":"https://github.com/attic-labs","followers_url":"https://api.github.com/users/attic-labs/followers","following_url":"https://api.github.com/users/attic-labs/following{/other_user}","gists_url":"https://api.github.com/users/attic-labs/gists{/gist_id}","starred_url":"https://api.github.com/users/attic-labs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/attic-labs/subscriptions","organizations_url":"https://api.github.com/users/attic-labs/orgs","repos_url":"https://api.github.com/users/attic-labs/repos","events_url":"https://api.github.com/users/attic-labs/events{/privacy}","received_events_url":"https://api.github.com/users/attic-labs/received_events","type":"Organization","site_admin":false},"repo":{"id":36778364,"name":"noms","full_name":"attic-labs/noms","owner":{"login":"attic-labs","id":12534679,"avatar_url":"https://avatars.githubusercontent.com/u/12534679?v=3","gravatar_id":"","url":"https://api.github.com/users/attic-labs","html_url":"https://github.com/attic-labs","followers_url":"https://api.github.com/users/attic-labs/followers","following_url":"https://api.github.com/users/attic-labs/following{/other_user}","gists_url":"https://api.github.com/users/attic-labs/gists{/gist_id}","starred_url":"https://api.github.com/users/attic-labs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/attic-labs/subscriptions","organizations_url":"https://api.github.com/users/attic-labs/orgs","repos_url":"https://api.github.com/users/attic-labs/repos","events_url":"https://api.github.com/users/attic-labs/events{/privacy}","received_events_url":"https://api.github.com/users/attic-labs/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/attic-labs/noms","description":"The versioned, forkable, syncable database","fork":false,"url":"https://api.github.com/repos/attic-labs/noms","forks_url":"https://api.github.com/repos/attic-labs/noms/forks","keys_url":"https://api.github.com/repos/attic-labs/noms/keys{/key_id}","collaborators_url":"https://api.github.com/repos/attic-labs/noms/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/attic-labs/noms/teams","hooks_url":"https://api.github.com/repos/attic-labs/noms/hooks","issue_events_url":"https://api.github.com/repos/attic-labs/noms/issues/events{/number}","events_url":"https://api.github.com/repos/attic-labs/noms/events","assignees_url":"https://api.github.com/repos/attic-labs/noms/assignees{/user}","branches_url":"https://api.github.com/repos/attic-labs/noms/branches{/branch}","tags_url":"https://api.github.com/repos/attic-labs/noms/tags","blobs_url":"https://api.github.com/repos/attic-labs/noms/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/attic-labs/noms/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/attic-labs/noms/git/refs{/sha}","trees_url":"https://api.github.com/repos/attic-labs/noms/git/trees{/sha}","statuses_url":"https://api.github.com/repos/attic-labs/noms/statuses/{sha}","languages_url":"https://api.github.com/repos/attic-labs/noms/languages","stargazers_url":"https://api.github.com/repos/attic-labs/noms/stargazers","contributors_url":"https://api.github.com/repos/attic-labs/noms/contributors","subscribers_url":"https://api.github.com/repos/attic-labs/noms/subscribers","subscription_url":"https://api.github.com/repos/attic-labs/noms/subscription","commits_url":"https://api.github.com/repos/attic-labs/noms/commits{/sha}","git_commits_url":"https://api.github.com/repos/attic-labs/noms/git/commits{/sha}","comments_url":"https://api.github.com/repos/attic-labs/noms/comments{/number}","issue_comment_url":"https://api.github.com/repos/attic-labs/noms/issues/comments{/number}","contents_url":"https://api.github.com/repos/attic-labs/noms/contents/{+path}","compare_url":"https://api.github.com/repos/attic-labs/noms/compare/{base}...{head}","merges_url":"https://api.github.com/repos/attic-labs/noms/merges","archive_url":"https://api.github.com/repos/attic-labs/noms/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/attic-labs/noms/downloads","issues_url":"https://api.github.com/repos/attic-labs/noms/issues{/number}","pulls_url":"https://api.github.com/repos/attic-labs/noms/pulls{/number}","milestones_url":"https://api.github.com/repos/attic-labs/noms/milestones{/number}","notifications_url":"https://api.github.com/repos/attic-labs/noms/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/attic-labs/noms/labels{/name}","releases_url":"https://api.github.com/repos/attic-labs/noms/releases{/id}","deployments_url":"https://api.github.com/repos/attic-labs/noms/deployments","created_at":"2015-06-03T03:44:49Z","updated_at":"2016-08-18T22:37:14Z","pushed_at":"2016-08-18T23:30:15Z","git_url":"git://github.com/attic-labs/noms.git","ssh_url":"git@github.com:attic-labs/noms.git","clone_url":"https://github.com/attic-labs/noms.git","svn_url":"https://github.com/attic-labs/noms","homepage":"","size":28674,"stargazers_count":3964,"watchers_count":3964,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":96,"mirror_url":null,"open_issues_count":205,"forks":96,"open_issues":205,"watchers":3964,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/attic-labs/noms/pulls/2388"},"html":{"href":"https://github.com/attic-labs/noms/pull/2388"},"issue":{"href":"https://api.github.com/repos/attic-labs/noms/issues/2388"},"comments":{"href":"https://api.github.com/repos/attic-labs/noms/issues/2388/comments"},"review_comments":{"href":"https://api.github.com/repos/attic-labs/noms/pulls/2388/comments"},"review_comment":{"href":"https://api.github.com/repos/attic-labs/noms/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/attic-labs/noms/pulls/2388/commits"},"statuses":{"href":"https://api.github.com/repos/attic-labs/noms/statuses/47abff40a10fa686ead91d7c32d6b12329487af1"}}}}
{"actor":{"display_login":"kalman"}}