All geek questions in one place

SVN Repeat interactive conflict resolution

If I do an update in SVN, which leads to a conflict, SVN offers me a number of options for handling the conflict of each file, including accepting any file, running an external merge program, or delaying the resolution of the conflict.

If I decide to defer conflict resolution, how can I get SVN to repeat the conflict resolution process. In particular, how do I get SVN to re-offer the choice of accepting a file or starting an external merge tool?

[Refresh] In response to the answers of Thomas and Skippy.

Thanks for answers. So, as it turned out, SVN has no command to restart the conflict resolution process. Personally, I think it sucks.

One option for the SVN conflict resolution process is to select which file I want to save. Doing this in SVN has the advantage that SVN itself handles copying and deleting the corresponding files, this eliminates the need for direct interaction with the file system and reduces the possibility of making an error.

Another option that the SVN conflict resolution process offers is the ability to run an external merge editor. The editor that starts and how to configure it can be configured in the SVN configuration file. This is very convenient, as it means that the user does not need to manually upload the three files to an external merge editor.

Also, it just wasn't encoded, is there any reason SVN doesn't offer a means to restart the conflict resolution process? (Perhaps calling svn resolve with only the path argument). Another reason why this would be good is that it can offer the choice of a single file solution or work recursively on a working copy or subtree in a working copy.

+6
source share
3 answers

In svn 1.8.8, if you run "svn resolve" in the file of interest, svn will offer interactive conflict resolution

+2
source

You simply cannot make him re-offer a choice. You have no choice but the following:

  • Combine the conflicting text "manually" (by examining and editing the conflicts in the file).

  • Copy one of the temporary files on top of your working file.

  • Run svn to discard all your local changes.

Once you resolve the conflict, you need to tell Subversion that svn is running. This removes the three temporary files and Subversion no longer considers the file to be in conflict. [6]

(from http://chestofbooks.com/computers/revision-control/subversion-svn/Postponing-Conflict-Resolution-Tour-Cycle-Resolve-Pending.html )

+2
source

SVN will no longer ask you. However, when starting svn stat from the command line, you should see a list of conflicting files. They will be marked as “C”, just as if you had a modified file, it has “M” or if the file was not added, it has “?”.

Now you need to manually run svn resolve for each of the files.

0
source

Source: https://habr.com/ru/post/914881/

More articles:


All Articles