# unmerged: profiles/package.mask on the remote package.mask is a file locally it is a directory. I need to know how I can resolve this merge without mergetool as currently mergetool doesn't handle it well. I want to delete the remote version of package.mask tried: git rm :3:profiles/package.mask fatal: pathspec ':3:profiles/package.mask' did not match any files mergetool will move my directory to a backup directory if I tell it to delete package.mask it doesn't move the directory back into place, if I tell it to use the remote version it obviously copies it into place... I'd be ok if when I told it to delete it, it restored the directory from backup. regardless of mergetools problems I'd like to know how to fix this merge without mergetool. -- Caleb Cushing http://xenoterracide.blogspot.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
