On Fri, Mar 16, 2012 at 4:07 PM, Greg Stein <gst...@gmail.com> wrote:
> Personally, I'd be surprised if an edit/move conflict is all that > common. Maybe you/others have some data on this? More prevalent in > larger teams? Remote uncoordinated teams? I may be a victim of selection bias in that I spend most of my time working with Java projects, but IMO, this has always been the #1 complaint against Subversion. Renaming is extremely common in Java and in large teams this is a nightmare. I have long maintained that most of the complaints about merge in Subversion are more about this issue then about the kinds of issues that we classify as "merge tracking". I think the majority of users I work with would greatly appreciate it if Subversion handled these cases automatically and handled it more like a text conflict when it could not. -- Thanks Mark Phippard http://markphip.blogspot.com/
