Use this command to mark conflicting files/directories as resolved. You need to resolve conflicts to be able to commit the files/directories. In case of directories you have the option to Resolve files and subdirectories recursively. If deselected, only the property conflicts of the directory itself will be resolved.