{"thread":{"id":"28001","subject":"repeatedly conflicting files when using git svn rebase","startedAt":"2011-08-03T00:41:09Z","lastAt":"2011-08-03T00:41:09Z","messageCount":1,"participants":["Mike Gant"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"172722","messageId":"CAPbp7P4XCsFJQL8zujkCbcLH+sEGMRUGES-Skre-OEB2vb=Nmg@mail.gmail.com","threadId":"28001","inReplyTo":null,"subject":"repeatedly conflicting files when using git svn rebase","fromName":"Mike Gant","fromEmail":"mwgant@gmail.com","sentAt":"2011-08-03T00:41:09Z","receivedAt":"2011-08-03T00:41:09Z","isPatch":false,"sender":{"key":"mwgant@gmail.com","avatar":null},"body":"All,\n\nI have a problem where every time I run 'git svn rebase', I have the\nsame files with conflicts. Not only that but when I fix the conflict,\nthere is no change to add and I end up having to do 'git rebase --skip'.\nSome of the differences are only whitespace but all are minor changes.\nI've tried choosing the other part of the conflict (so I end up using\n'git rebase --continue') but I still have the conflicts the next time I\nrun 'git svn rebase' . I should also note that this happens _everytime_\nI run 'git svn rebase' even consecutive times with absolutely no other\noperations in between. Does anyone have any suggestions?\n\n(Unfortunately, I cannot share the repo.)\n\nThanks,\nMike\n"}]}