更新时间:2023-12-05 20:09:28
签入 findmerge
手册页 :
您不需要先合并目录,然后合并文件。 findmerge
应该独自完成正确的合并(目录,然后是文件)。
You shouldn't need to merge first the directories, then the files.findmerge
should do the right merges (directories, then files) all by itself.
cleartool findmerge . -nc -fver .../dev/LATEST -merge
就足够了。
cleartool findmerge . -nc -fver .../dev/LATEST -print
将打印需要合并的内容,但会停在目录中。
will print what needs to be merged, but will stop at the directories.