* repeatedly conflicting files when using git svn rebase
@ 2011-08-03 0:41 Mike Gant
0 siblings, 0 replies; only message in thread
From: Mike Gant @ 2011-08-03 0:41 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-03 0:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-03 0:41 repeatedly conflicting files when using git svn rebase Mike Gant
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).