From 679ed0b158d3936347781cf7dcd511135c756a47 Mon Sep 17 00:00:00 2001
From: Erin Hales <36751902+ErinHales@users.noreply.github.com>
Date: Tue, 13 Jul 2021 23:09:07 -0600
Subject: [PATCH] add: resolve-typechain-conflicts script (#486)

---
 resolve-typechain-conflicts.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 resolve-typechain-conflicts.sh

diff --git a/resolve-typechain-conflicts.sh b/resolve-typechain-conflicts.sh
new file mode 100644
index 000000000..19e34a716
--- /dev/null
+++ b/resolve-typechain-conflicts.sh
@@ -0,0 +1,8 @@
+rm -rf typescript/src/typechain
+cd solidity/optics-core 
+hardhat compile
+cd ../optics-xapps
+hardhat compile
+cd ../..
+git add typescript/src/typechain
+git rebase --continue
\ No newline at end of file