{"push_id":1190099236,"size":2,"distinct_size":1,"ref":"refs/heads/feature/1971-double-count-opps","head":"f09449d21d296c01d56e6b397197511bd332e67e","before":"f15f2f53dacf059d0e7c431f3cc1eb7c5408ae87","commits":[{"sha":"3032f63075b7a73e3359e60d0cd03b2545f9124d","author":{"name":"Jason Bury","email":"4fe0c0251cdf7c4e989e3b7fe955a91a5531af46@salesforce.com"},"message":"Merge remote-tracking branch 'cdcarter/feature/1971-double-count-opps' into dev\n\n Conflicts:\n    src/classes/RLLP_OppPartialSoftCreditRollup.cls\n\nThe conflict comes from the fact that @davidhabib refactored the OCR and PSC\nquery generation from RLLP_OppPartialSoftCreditRollup into RLLP_OppRollup_UTIL,\nwhile also adding an exclusion clause for certain opportunity record types.\n\nHowever, @cdcarter's change requires the addition of OpportunityId to the OCR\nquery.\n\nI am resolving this conflict by accepting the origin/dev changes to\nRLLP_OppPartialSoftCreditRollup, but also modifying RLLP_OppRollup_UTIL to\ninclude the OpportunityId in the OCR query.","distinct":false,"url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/commits/3032f63075b7a73e3359e60d0cd03b2545f9124d"},{"sha":"f09449d21d296c01d56e6b397197511bd332e67e","author":{"name":"Mr Belvedere","email":"7f810a3e2599a2ec178b90c276e90dcfe78acfa3@salesforcefoundation.org"},"message":"Merge dev into feature/1971-double-count-opps","distinct":true,"url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/commits/f09449d21d296c01d56e6b397197511bd332e67e"}]}
{"actor":{"display_login":"mrbelvedere"}}