search

twosigma / git-meta

Repository for the git-meta project -- build your own monorepo using Git submodules
http://twosigma.github.io/git-meta
BSD 3-Clause "New" or "Revised" License
216 stars 50 forks source link

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

Closed geofft closed 1 year ago

geofft commented 2 years ago

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