Merge local files with repository