I wrote: > ... > I expected it to flag conflicts on the files we've updated but instead > it just adds the new file as another revision and ignores our changes. > ... To clarify, it imports the file from the new release as a new revision of the file we changed, which was in the initial impoprt. It's not really a new file, just a new version of an existing file.