While working on a SVN project using my new favorite tool, “git”, I ran into a small problem. A network bobble caused the subversion portion to fail. I stopped it, but then when I tried again, git said:
Cannot dcommit with a dirty index. Commit your changes firstor stash them with `git stash'.
Some searching found the solution:
1. git checkout $branch
2. git log -g
(look for your last commit, copy the hash for it)
3. git reset --hard $hash
4. git svn rebase
5. git svn dcommit
It worked perfectly, and I can once again use git side-by-side with the unwashed legions of SVN users.
0 responses so far ↓
There are no comments yet...Kick things off by filling out the form below.
Leave a Comment