# repeatedly conflicting files when using git svn rebase

1 messages from 2011-08-03 to 2011-08-03. Participants: Mike Gant.
Thread: https://gitlist.dev/t/28001

## Mike Gant, 2011-08-03 00:41

Subject: repeatedly conflicting files when using git svn rebase
Message-ID: <CAPbp7P4XCsFJQL8zujkCbcLH+sEGMRUGES-Skre-OEB2vb=Nmg@mail.gmail.com>
URL: https://gitlist.dev/e/CAPbp7P4XCsFJQL8zujkCbcLH%2BsEGMRUGES-Skre-OEB2vb%3DNmg%40mail.gmail.com

```
All,

I have a problem where every time I run 'git svn rebase', I have the
same files with conflicts. Not only that but when I fix the conflict,
there is no change to add and I end up having to do 'git rebase --skip'.
Some of the differences are only whitespace but all are minor changes.
I've tried choosing the other part of the conflict (so I end up using
'git rebase --continue') but I still have the conflicts the next time I
run 'git svn rebase' . I should also note that this happens _everytime_
I run 'git svn rebase' even consecutive times with absolutely no other
operations in between. Does anyone have any suggestions?

(Unfortunately, I cannot share the repo.)

Thanks,
Mike

```