{"thread":{"id":"23445","subject":"Error doing git svn rebase","startedAt":"2010-04-13T12:54:12Z","lastAt":"2010-04-13T12:54:12Z","messageCount":1,"participants":["Daniel Lidström"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"139420","messageId":"FE8B524F1BF0854187E434B85105AC694869F8@dorado.ad.sbg.se","threadId":"23445","inReplyTo":null,"subject":"Error doing git svn rebase","fromName":"Daniel Lidström","fromEmail":"daniel.lidstrom@sbg.se","sentAt":"2010-04-13T12:54:12Z","receivedAt":"2010-04-13T12:54:12Z","isPatch":false,"sender":{"key":"daniel.lidstrom@sbg.se","avatar":null},"body":"Hello,\n\nI have cloned our subversion repository using git svn clone. Then I have made a few changes\nand committed a few times. Now I would like to do git svn rebase before I continue, to be\nsure I don't get too much out-of-sync with the subversion repository. However, git-svn fails\nlike this:\n\nluna:/home/daniel/projects/UMC3D-9.1.git(master)> git svn rebase\nFirst, rewinding head to replay your work on top of it...\nApplying: - Doxygen fixes.\nApplying: - Code cleanups.\nApplying: - Logging fixes.\nfatal: Unable to create '/home/daniel/projects/UMC3D-9.1.git/.git/index.lock': File exists.\n\nIf no other git process is currently running, this probably means a\ngit process crashed in this repository earlier. Make sure no other git\nprocess is running and remove the file manually to continue.\nrebase refs/remotes/git-svn: command returned error: 1\n\nluna:/home/daniel/projects/UMC3D-9.1.git> git branch\n* (no branch)\n  master\nluna:/home/daniel/projects/UMC3D-9.1.git> git checkout master\nerror: Entry 'GeoROG/Control/MikrofynAdvancedBladeController.cpp' would be overwritten by merge. Cannot merge.\n\nluna:/home/daniel/projects/UMC3D-9.1.git> dir .git/index.lock\nls: cannot access .git/index.lock: No such file or directory\nluna:/home/daniel/projects/UMC3D-9.1.git> git --version\ngit version 1.6.3.3\nluna:/home/daniel/projects/UMC3D-9.1.git> git svn --version\ngit-svn version 1.6.3.3 (svn 1.6.5)\nluna:/home/daniel/projects/UMC3D-9.1.git> \n\nAt this point I am not sure how to best handle this problem. Any help would be much appreciated!\n\nRegards,\n\nDaniel Lidström\nStockholm, Sweden \n"}]}