{"push_id":702858206,"size":18,"distinct_size":18,"ref":"refs/heads/develop","head":"fbd0b5eb61ae714d61b516f014a17efd41e285f3","before":"fce05da4337a3e8fadbbfcd0d276cc2ceda0df6f","commits":[{"sha":"0c0dfbbbe087502f0df7dcd477be222ca697638b","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: initial OT/vcs2 integration","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/0c0dfbbbe087502f0df7dcd477be222ca697638b"},{"sha":"258a94f997b966aa90453241a74e45ca58f41595","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: bugfix, get correct version map from sync, mark version change when updating children","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/258a94f997b966aa90453241a74e45ca58f41595"},{"sha":"e692d215a365154a05661481bbc44cf16a1c3f7b","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: make moving or adding a node update the node itself.  corresponding PreliminaryMerge updates","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/e692d215a365154a05661481bbc44cf16a1c3f7b"},{"sha":"cc0cda9778be492a6abe4f17efa942191eaff4d6","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: improve sort order of merged child lists","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/cc0cda9778be492a6abe4f17efa942191eaff4d6"},{"sha":"31166775fe2115d29994922985e48d403c360f32","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: minor improvements to Conflicts","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/31166775fe2115d29994922985e48d403c360f32"},{"sha":"d5ef039bb5160759367b260b07ea122e4057f6c6","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: Observation resurrection correct - completes resurrected observations","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/d5ef039bb5160759367b260b07ea122e4057f6c6"},{"sha":"14a19f842958ada4f4459e2b1018a752296ff73d","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: fix test case compile warnings","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/14a19f842958ada4f4459e2b1018a752296ff73d"},{"sha":"b0c0da03db779c63371b96063c82d6841553258c","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: rollback change to mark moved nodes as modified","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/b0c0da03db779c63371b96063c82d6841553258c"},{"sha":"3f164feadc29838ac8324c3a83b5013393e916cb","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: correct the observation link in update permission failure notes","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/3f164feadc29838ac8324c3a83b5013393e916cb"},{"sha":"53b3fa4c7d31fb1cb6d940113e4645d1df05a249","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: remove (at least for now) replaced remote delete and resurrected local delete conflict notes","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/53b3fa4c7d31fb1cb6d940113e4645d1df05a249"},{"sha":"fcff3027a48819a28987384e1671bca41a3b8be4","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: a bit of cleanup","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/fcff3027a48819a28987384e1671bca41a3b8be4"},{"sha":"3f660ac6d57fc0a3b010b903dfe3abc13d531de9","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: added obs resurrection completion test case","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/3f660ac6d57fc0a3b010b903dfe3abc13d531de9"},{"sha":"5f8e7a6cbbf1122333d4ed3610d9d8c9db9d6c1f","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: minor doc and cleanup","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/5f8e7a6cbbf1122333d4ed3610d9d8c9db9d6c1f"},{"sha":"8f45bac1896427449862076ae34026f1ed12b60c","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: bugfix, show Synchronizing ... message in dialog","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/8f45bac1896427449862076ae34026f1ed12b60c"},{"sha":"dd575d1ba065eaa226b367882987b0bc190c5896","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: fix scalaz stack overflow issue for huge programs","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/dd575d1ba065eaa226b367882987b0bc190c5896"},{"sha":"a430fdfb37fe9f995b214eadb8ed9d51271924af","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: address PR comments","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/a430fdfb37fe9f995b214eadb8ed9d51271924af"},{"sha":"d2a64d8666eef078c92da2f588a2a0dd7dda67dd","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@mac.com","name":"swalker2m"},"message":"OCSADV-200: fix test case","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/d2a64d8666eef078c92da2f588a2a0dd7dda67dd"},{"sha":"fbd0b5eb61ae714d61b516f014a17efd41e285f3","author":{"email":"609c717e98068cc78c0988300adeba42386d53e1@users.noreply.github.com","name":"Shane Walker"},"message":"Merge pull request #471 from swalker2m/feature/OCSADV-200-S\n\nOCSADV-200-S: Initial OT Integration + Merge Tweaks","distinct":true,"url":"https://api.github.com/repos/swalker2m/ocs/commits/fbd0b5eb61ae714d61b516f014a17efd41e285f3"}]}