Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for 
change notification.

The "ResolvingIncomingMoves" page has been changed by StefanSperling:
https://wiki.apache.org/subversion/ResolvingIncomingMoves?action=diff&rev1=2&rev2=3

Comment:
fix merge source url

+ 
  = How the conflict resolver deals with incoming moves =
  
  An incoming move during an update/switch/merge operation appears
@@ -198, +199 @@

  at the BASE revision of A as the changed tree.
  Any nodes which have changed since rYCA trigger edits in the B subtree.
  This can be implemented by running the equivalent of a standard merge
- -rYCA:BASE ^/A@BASE into B.
+ -rYCA:BASE ^/branch/A@BASE into B.
  
  This results in:
  

Reply via email to