1.add to version control
文件加入受控有两种方式:
1、直接在提交对话框中选上未受控的文件,提交
2、先add to version control,再提交
2.add to svn:ingore: 忽略该文件,一般如.actionScriptProperties .flexProperties .project等文件。此时这些文件不会被同步。
3.svn revert — 取消所有的本地编辑,包括属性修改。
4.svn mark as merged:一般是有冲突的时候,将远程文件的更新部分复制到本地文件,然后执行。此时,可以提交本地文件。
5.svn mark resolved:有冲突的时候标记本地文件,表明冲突已解决,可以继续提交。英文如下:
If the repository version is different from your local copy, you'll need to mark the local copies as resolved with svn resolved <FILENAME>
in order to commit it. It should go without saying that you actually resolve the differences before you mark it as such.