Use full path when checking for conflicts

Otherwise the target might not be resolved with realpath() and we get false positives

Author: schmengler

modman.php

@@ -557,7 +557,8 @@ public function doDeploy($bForce = false, $bCopy = false) {
 				if (!is_dir($sDirectoryName)) {
 					$oConflicts->checkForConflict($sDirectoryName, 'dir');
 				}
-				$oConflicts->checkForConflict($oLine->getSymlink(), 'link', $oLine->getTarget());
+				$sFullTarget = $sTarget . DIRECTORY_SEPARATOR . $oLine->getTarget();
+				$oConflicts->checkForConflict($oLine->getSymlink(), 'link', $sFullTarget);
 			} else {
 				unset($aLines[$iLine]);
 			}