2012/4/11 Pap Lôrinc <paplorinc@xxxxxxxxx>: > Hello! :) > > We are working in parallel on the refactoring of a > small project. The team uses SVN and I decided to give GIT a chance to > demonstrate it's merging capabilities I've read so much good about :). > > However > - I must be doing something VERY wrong - every time I try to merge from > the remote svn (git svn fetch and git merge remotebranch) into my > branch, I get hundreds of conflicts, mostly because of moved folders. Google is your friend https://wiki.kuali.org/display/KULRICE/git-svn+how+to http://flavio.castelli.name/howto_use_git_with_svn http://viget.com/extend/effectively-using-git-with-subversion http://java.dzone.com/articles/how-start-using-git-svn-based -- David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html