Fix flaky test "rebase in a sub, was conflicted" (fixes #864)
Fix flaky test "rebase in a sub, was conflicted" (fixes #864)

Make a branch for the original commit of the conflicted rebase so that
`git gc` isn't inclined to garbage-collect it.

twosigma/git-meta