3 # resolves a tree conflict by accepting the "working" version,
4 # which effectively makes your current change the accepted one.
6 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
7 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
13 if [ -z "$filename" ]; then
14 echo "This script needs a filename to operate on."
18 svn resolve --accept=working "$filename"
19 test_or_die "resolving tree conflict by accepting the working directory as the right one"