OTWO-3222: Fix svn checkout failures during svn-git conversion

I'm going to merge this, but since this is the only method using this structure to define a class method, I'm going to change it to the `def self.has_conflict?` style.