Recover history from foolish git-svn merge
- by Gregg Lind
the players:
master: the svn branch (actual, not local trackign)
mybranch: a local branch
My mistake:
[master] git svn rebase
[master] git merge mybranch
[master] git svn dcommit
I did this twice.
Is there a way I can remedy all this? I was thinking something like:
git checkout --hard [commit before the merging]
git dcommit # that to the svn?
git rebase mybranch
git dcommit
But this doesn't seem to work.
(I know I should a. working from a local tracking branch and b. have rebased rather than merged)
I'm in the frantic / willing to send beer to respondents stage :)
