On Thu, Apr 12, 2012 at 3:23 PM, Pap Lôrinc <paplorinc@xxxxxxxxx> wrote: >>> 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 > > I have no idea why you guys think I'm an idiot. > I have read every link I could find (most of the Pro Git book and watched several hours of git video tutorials). The problem is not with GIT-SVN, it's with the GIT merge, more specifically with a simultaneous modify and move, which conflicts probably because it is detected as a modify and delete. > Could someone please be a little more friendly, I need advice on how to solve hundreds of git merge conflicts (eg. parallel move and modify, which should have been merged automatically). Hi Pap, I think I understand the issue you are facing. I assume that your collaborators are following the practice of one-commit-per-factor-operation. My experience with this has been that synchronizing work best if changes are "bubbled up". I did this by progressively rebasing my branch against each upstream commit. I hope this helps a little. -- David Barr -- 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