"use branches with atomic commits and then get paid for based on each commit in the branch" model will likely fix this