Hi, I made a git svn repository from an svn repository. Then I cloned
the git repository, committed some changes to the clone, and pulled back
to the original repository. However, now the original repository gives
me conflicts whenever I run git svn rebase. I believe this is because
git pull treats the other repository's commits as a branch and merges
them back instead of rebasing them and maintaining the type of linear
history that is good for playing with svn. Any hints as to how to fix
this? I think the solution is to undo the merge that resulted from the
pull, but I don't know how to do this.
I wrote a simple script reproducing exactly what's going on (along with
a transcript of its output). I tried to make it as simple as possible,
but it can probably be simplified even more to reproduce the problem:
http://assorted.svn.sourceforge.net/viewvc/assorted/sandbox/trunk/src/git/gitsvn.bash?revision=1057&view=markup
Thanks in advance for any help!
--
Yang Zhang
http://www.mit.edu/~y_z/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
