I'm merging trunk into my branch to keep it up to date, but the process adds <<<<<<< .working
(and other, similar metadata) within the files themselves - I've been getting a large number of tree errors but I've made some extensive changes so it's to be expected (although it seems like the merge is flagging every single folder as a tree conflict)
Is there any way to prevent Tortoise SVN from adding this metadata to the file directly (that messes about with its ability to compile) and/or cleaning a large number of files without having to revert + re-merge?
APPEND: The answers so far are correct however, the problem here is that metadata was remaining after resolving the conflict. Could this just be a bug?
These markers are inserted when tortoise can't resolve merge conflicts automatically, so it marks those as conflicted with information from both files - working copy and repository. These markers will be removed after you resolve conflicts in any way - manually with TortoiseMerge, with menu items "resolve conflicts use mine"/resolve conflicts use theirs". But you have to decide what part will be used in your working copy after update.
Those <<<<<<<
markers are added by Subversion itself (it isn't a TortoiseSVN feature) but as far as I know not for tree conflicts. You must have regular file conflicts.
As far as I know, TortoiseSVN doesn't have any feature to fully automate conflict resolution. Options I can think of:
当我们运行合并并且冲突不止一次出现在同一个文件中时,就会发生这种情况。
Those metadata are written by SVN because of conflicts. You can solve using this command:
svn resolved <directory>
If SVN does not support "merge tracking", you might get the same conflicts every time you repeat your merge. Make sure that "merge tracking" is available.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.