On Thu, Jul 17, 2008 at 10:43 AM, Alexander Groß wrote: > > Not only do my colleague's latest changes get applied (SVN commit C), but > also those changes from SVN commit B will be rebased, often resulting in > merge conflicts. > > Is there a way to omit SVN commit B during the SVN rebase? As matter of fact > it's already in my Git repo (and the according git-svn-id is in the log).
"rm -rf .git/svn" before you "git svn rebase" to force git-svn to rebuild its index from the metadata in the commits. Peter Harris
