Problems encountered in combining code with SVN
During svn merge revisions, if there are several revision conflicts, we hope that after the current conflict is resolved, the revision will continue to combine the code.
If we abort merge when we encounter a conflict, then after we have resolved the current conflict, we will not know how to operate or it is inconvenient to operate.
Regedit opens the registry and modifies the value of the MergeNonInteractive variable to 0. You can set up the interaction and let yourself choose what to do when the combined code encounters a conflict.
