Conflict resolution 

$ svn update
C  lib/Product.pm
Updated to revision 118
$ ls lib/Product.pm*
lib/Product.pm
lib/Product.pm.mine
lib/Product.pm.r117
lib/Product.pm.r118

• Resolve it:

$ svn resolve lib/Product.pm
$ svn commit -m "- fixed broken constructor" lib/Product.pm

• Or revert it:

$ svn revert lib/Product.pm