git-svn rebase and dcommit problem

前端 未结 4 1754
余生分开走
余生分开走 2021-02-09 03:09
git version 1.7.1
svn, version 1.6.12
Ubuntu 10.10

I have just git and I have used svn. But I haven\'t used then together. I had a git repository, and

4条回答
  •  清酒与你
    2021-02-09 04:13

    I'm running into a similar problem, likely because I pushed to my git remote before pushing to the SVN remote and thus messed up my git history. It seems like each time I try to commit something to svn, git tries to replay ALL my previous commits even though they already exist in svn, so I just do git rebase --skip until I get back to the latest commit, but the easiest solution is probably to just clone a fresh git svn.

提交回复
热议问题