try

.github/workflows/sync-subnet-evm-branch.yml

@@ -23,7 +23,7 @@ jobs:
 
           - name: Add Remote
             run: |
-              git remote add -f subnet-evm https://github.com/ava-labs/subnet-evm
+              git remote add subnet-evm https://github.com/ava-labs/subnet-evm
         
           # TODO: Can use default when we remove the push trigger hack
           # TODO: Replace test branch with actual (eg, coreth)

scripts/apply_diff_and_rename.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Add other repo as a remote: `git remote add -f coreth [email protected]:ava-labs/coreth.git`.
+# Usage: ./scripts/apply_diff_and_rename.sh coreth/master (or subnet-evm/master)
+
+set -e;
+set -u;
+
+ROOT=$(git rev-parse --show-toplevel);
+cd "${ROOT}";
+
+BASE="${1}";
+
+git diff .."${BASE}" --binary | git apply --whitespace=nowarn
+
+if [[ "${BASE}" == coreth* ]]; then
+    echo "Replacing coreth with subnet-evm"
+    sed_command='s!github.com/ava-labs/coreth!github.com/ava-labs/subnet-evm!g'
+else
+    echo "Replacing subnet-evm with coreth"
+    sed_command='s!github.com/ava-labs/subnet-evm!github.com/ava-labs/coreth!g'
+fi
+
+# TODO: improve this command that finds all the "coreth" references and replaces them with "subnet-evm"
+LANG=C find . -type f \! -name 'apply_diff_and_rename.sh' \! -path './.git/*' \! -path './contracts/node_modules/*' -exec sed -i '' -e "${sed_command}" {} \;
+gofmt -w .
+go mod tidy
+
+# Restore contracts/.gitignore
+git checkout -- contracts/.gitignore