From e81f45c55fb9ac42e1ce57fc50fa3cfb2b407e3a Mon Sep 17 00:00:00 2001
From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 8 Oct 2013 19:15:05 -0400
Subject: [PATCH] new script to resolve tree problem for svn.

---
 scripts/rev_control/fix_svn_item.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 scripts/rev_control/fix_svn_item.sh

diff --git a/scripts/rev_control/fix_svn_item.sh b/scripts/rev_control/fix_svn_item.sh
new file mode 100644
index 00000000..64eabaa5
--- /dev/null
+++ b/scripts/rev_control/fix_svn_item.sh
@@ -0,0 +1,8 @@
+#!/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"
-- 
2.34.1