2

According to the git-svn manual about git svn rebase:

If you have local changes, you must either stash your work or temporarily commit it before running git svn rebase — otherwise, the command will stop if it sees that the rebase will result in a merge conflict

However every time I git rebase, I always get the needs update error message with any locally modified file, even if it would not conflict with incoming changes:

> git svn rebase
path/to/file.txt: needs update

I'm using git-svn version 2.15.0.windows.1 (svn 1.9.7). Is the manual out of date, or am I missing something?

trethaller
  • 567
  • 3
  • 16

1 Answers1

0

I have seen that even for a simple git pull

Check your git config core.autocrlf, and make sure it is set to false: that way, you won't have any automatic eol (end of line) modification on checkout (which is the first operation of a rebase)

VonC
  • 1,129,465
  • 480
  • 4,036
  • 4,755