乌龟 SVN: 用“他们的”来解决冲突。这是什么意思？

有没有人能解释一下 Tortoise SVN 在冲突文件上的两个选项之间的区别:

  • 用“他们的”来解决冲突。
  • 用“ mine”解决冲突。

顺便说一句，到底为什么从来没有人报告过这种将术语作为 bug 的混乱用法呢？

52138 次浏览
小开
最佳答案

Resolve conflict using 'theirs' means that when you try to check in two files that have conflicting edits, SVN will discard your changes and use the other persons change instead.

Resolve conflict using 'mine' means that you will discard their changes, and use your version of the file instead.

小开

I wanted to add the whole list for further reference:

(e)  edit             - change merged file in an editor
(df) diff-full        - show all changes made to merged file
(r)  resolved         - accept merged version of file


(dc) display-conflict - show all conflicts (ignoring merged version)
(mc) mine-conflict    - accept my version for all conflicts (same)
(tc) theirs-conflict  - accept their version for all conflicts (same)


(mf) mine-full        - accept my version of entire file (even non-conflicts)
(tf) theirs-full      - accept their version of entire file (same)


(p)  postpone         - mark the conflict to be resolved later
(l)  launch           - launch external tool to resolve conflict
(s)  show all         - show this list
小开

I agree.

Seems to me that it would be more clear if it said:

  • Resolve using repository (theirs)
  • Resolve using working copy (mine)
小开

BuzzAnn is correct. mine vs theirs is ambiguous, since what's in the repository might also be mine. The unambiguous distinction is repository vs local copy.

小开

The SVN command line merge is confusing especially when merging a branch back into the trunk. "My changes" are the ones I made in the branch, but that would be wrong according to SVN. To really complicate things, SVN refers to the paths as SOURCE, TARGET, and HEAD in the command line help.

Here is the simple answer, if you run this merge statement from the directory C:\Project1\Trunk

svn merge -r 60:68 C:\Project1\branches\UpdatesToProject1

"Mine" is the directory that SVN is being run from (C:\Project1\Trunk).

"Theirs" is the directory that you are merging in and have specified on the command line (C:\Project1\branches\UpdatesToProject1)

It would be really really nice if SVN gave the paths that MINE and THEIRS refer to.

小开

If you accept that what is in the repository is no longer (solely) yours, it is shared with all that have access, then it might be clearer.

In this context:

"theirs" means "the team's shared code in the repository" "mine" means (my)"working copy" (probably on local machine)

"using theirs" replaces your working copy with the shared copy, discards your changes that exist on your local machine. "using mine" deciding that the code in your working copy is what should be kept in repository, discarding what is currently in the repo.


提交答案