I found the thing that tipped the scales for people who were set in their ways was walking them through a merge and showing that tree conflicts don't exist. And that merging doesn't need to take more than 5 minutes.
I work on a codebase that changes pretty fast, and git has hugely reduced time wasted screwing around with tree conflicts and SVN losing its lunch.
I work on a codebase that changes pretty fast, and git has hugely reduced time wasted screwing around with tree conflicts and SVN losing its lunch.