diff --git a/tmp.sh b/tmp.sh
new file mode 100755
index 0000000000..bfe0483e72
--- /dev/null
+++ b/tmp.sh
@@ -0,0 +1,3 @@
+git checkout --ours -- . # Resolve conflicts by accepting current changes
+git add . # Stage the resolved conflicts
+git rebase --continue
\ No newline at end of file