Use "file" parameter, if present, to determine data format typeString in ResourceLocator
Fix some git "fast-forward" problem.
Fix some git "fast-forward" problem.