Error rebaseing/updating a git-svn repository

Question

Hoping this is not a dup, I didn\'t find any concise information on how to update a git-svn repo. I used git svn clone to import an SVN repo into git. Then, after doing some

Answer 1

If I recall correctly, that means that there are uncommitted changes to that file. What's the output of git status?

Answer 2

If you are working on a Windows system and the output of git status returns "no changes added to commit", it may be a problem with the file attributes on FAT file system. Try executing git config core.fileMode false

Also the autocrlf setting could cause this.

Answer 3

Looks like you have uncommitted file changes.

git status
# if you see pending changes, you can do multiple things

1. Stash them and pull latest and revisit them.

   git stash git svn rebase git stash pop

2. If changes are intended and u like to commit it.

   git add <file> git commit -m '<commit message>' git svn rebase