Fwd: Best practices for updating old repos

(Sorry I sent this originally last night in gmail but not in plain text mode and it bounced) Hi Michael, In git if you don't merge often then you get these merge conflict hell situations. In my experience the main conflicts come not from the unified diff of those 130 commits but from difference

[Announce] Availability of a Java based Subversion to Git conversion program with automatic (and pluggable) branch detection for whole repository conversions

n to the Apache licence, Version 2.0). Hopefully it will be useful to others, Regards, Michael -- Michael O'Cleirigh Java Developer Enterprise Applications and Solutions Integration (EASI) University of Toronto -- To unsubscribe from this list: send the line "unsubscribe git&qu