3 # resolves a tree conflict by accepting the "working" version,
4 # which effectively makes your current change the accepted one.
8 svn resolve --accept=working "$filename"
9 test_or_die "resolving tree conflict by accepting the working directory as the right one"