add repo for conflict during rebase
fix test running to copy wd, test for rebase, trim refs/heads/ during rebase