Re: Parallel refactoring and git merge nightmare

2012/4/12 Pap Lôrinc [off-list ref]:

quoted

quoted

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).

Thanks,
Lőrinc

Could you perhaps show us what commands you have tried, and what the
conflicts look like?

Regards,

Andrew Ardill