Re: Parallel refactoring and git merge nightmare

Thank you all for the answers! :)

I have already set the rename limit to 0, and upon committing and fetching the renames are calculated and found.

The commands are (I use tortoise git now, but tried the console and other GUIs, as I said in my first post) "git svn fetch" and "git merge remoteBranch". I figured now, that this was the problem, I should have used rebase instead of merge (I still don't understand why merge doesn't work, but rebase and conflict resolution with a GUI (where I can resolve more files at once) seems acceptable). Thanks David! :)

Lőrinc