Merge pull request #4787 from nervosnetwork/update-dev-script-to-merg…

…e-master chore: include latest_assume_valid_target.rs when merging master
nervosnetwork · Feb 17, 2025 · 6621462 · 6621462
2 parents 37f0e28 + 1e6f577
commit 6621462
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/devtools/git/merge-master.sh b/devtools/git/merge-master.sh
@@ -3,4 +3,8 @@
 set -eu
 
 git merge --no-ff --no-commit -s ours master
-git checkout master -- CHANGELOG.md src/main.rs resource/specs/testnet.toml resource/specs/mainnet.toml resource/specs/mainnet.toml.asc .github/workflows/package.yaml util/constant/src/default_assume_valid_target.rs
+git checkout master -- \
+    CHANGELOG.md src/main.rs resource/specs/testnet.toml resource/specs/mainnet.toml \
+    resource/specs/mainnet.toml.asc .github/workflows/package.yaml \
+    util/constant/src/default_assume_valid_target.rs \
+    util/constant/src/latest_assume_valid_target.rs