ignore some branches

diff --git a/misc/tools/conflict-watch.sh b/misc/tools/conflict-watch.sh
index 63f67c545c0a83cd65a937b78c1c6b07dda6b825..966fef450b06b859b399702158d157987a4f3165 100755 (executable)
--- a/misc/tools/conflict-watch.sh
+++ b/misc/tools/conflict-watch.sh
@@ -139,6 +139,14 @@ case "$action" in
                        branches
                ) | while read -r HASH TYPE REFNAME; do
                        echo >&2 -n "$repo $REFNAME..."
                        branches
                ) | while read -r HASH TYPE REFNAME; do
                        echo >&2 -n "$repo $REFNAME..."

+                       case "$repo:$REFNAME" in
+                               xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant) continue ;;
+                               xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-original) continue ;;
+                               xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit) continue ;;
+                               xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit-goal) continue ;;
+                               xonotic/fteqcc.git:refs/remotes/origin/wip) continue ;;
+                               xonotic/darkplaces:refs/remotes/origin/master) continue ;;
+                       esac

                        out=$(
                                (
                                        if [ -n "$repodir" ]; then
                        out=$(
                                (
                                        if [ -n "$repodir" ]; then