>     BranchStore .push(branchName, v2, cb(err)) should assign v2 to the head of the branch, if v2 is a descendant of the current head:   ․ BranchStore .push(branchName, v2, cb(err)) should assign v2 to the head of the branch, if v2 is a descendant of the current head
>     BranchStore .push(branchName, v2, cb(err)) should merge the head version and v2 if not a direct descendant:   ․ BranchStore .push(branchName, v2, cb(err)) should merge the head version and v2 if not a direct descendant
>     BranchStore .push(branchName, v2, cb(err)) should fail if a conflict is encountered:   ․ BranchStore .push(branchName, v2, cb(err)) should fail if a conflict is encountered
140c143
<   137 passing (2s)
---
>   140 passing (2s)