SVN解决冲突(合并别人的修改)

SVN 解决冲突(合并别人的修改)

我们可以使用 svn status -u 来预测冲突，当你运行 svn update

一些有趣的事情发生了：

$ svn update U INSTALL G README Conflict discovered in 'bar.c'.

Select: (p) postpone, (df) diff-full, (e) edit, (h) help

for more options:

U 和 G 没必要关心，文件干净的接受了版本库的变化，文件标示为 U 表

明本地没有修改，文件已经根据版本库更新。G 标示合并，标示本地已

… (p) postpone - mark the conflict to be resolved later

(df) diff-full - show all changes made to merged file (e)

edit - change merged file in an editor (r) resolved -

accept merged version of file (mf) mine-full - accept my

version of entire file (ignore their changes) (tf) theirs-full

- accept their version of entire file (lose my changes) (l)

launch - launch external tool to resolve conflict (h)

help - show this list

After editing a file, tell svn that you've resolved the conflicts in

the file and that it should accept the current contents—basically

that you've “resolved” the conflict.

Show the list of all possible commands you can use in

interactive conflict resolution.

together by related functionality.

Viewing conflict differences interactively

Before deciding how to attack a conflict interactively, odds are that

is what you'll use for this:

… Select: (p) postpone, (df) diff-full, (e) edit, (h)elp

server (usually the HEAD revision). With this information in hand, you're

ready to move on to the next action.

Resolving conflict differences interactively

can use the “edit” command (e) to manually edit the file with conflict

markers in a text editor (determined by the EDITOR environment

in your Subversion configuration file (see “配置选项”一节 for more

server as part of the update, the copy of the file containing your local

markers). If your merge tool is expecting arguments in a different

invoke. After you've edited the file, if you're satisfied with the changes