chore: add merge-main script

psteinroe · psteinroe · commit 0dc1f982f313 · 2025-01-03T20:47:57.000-01:00
diff --git a/justfile b/justfile
@@ -137,3 +137,6 @@ clear-branches:
 
 reset-git:
     git checkout main && git pull && pnpm run clear-branches
+
+merge-main:
+    git fetch origin main:main && git merge main
