cleaning up revision control tools

[feisty_meow.git] / scripts / rev_control / resolve_svn.sh

diff --git a/scripts/rev_control/resolve_svn.sh b/scripts/rev_control/resolve_svn.sh
new file mode 100644 (file)
index 0000000..941e572
--- /dev/null
+++ b/scripts/rev_control/resolve_svn.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# resolves a tree conflict by accepting the "working" version,
+# which effectively makes your current change the accepted one.
+
+filename="$1"; shift
+
+svn resolve --accept=working "$filename"
+
+